diff --git a/last_commit.txt b/last_commit.txt index 02100a1977..0e9efe9503 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,16 +1,51 @@ -Repository: plone.restapi +Repository: plone.staticresources -Branch: refs/heads/master -Date: 2021-02-18T21:04:48+01:00 -Author: Alin Voinea (avoinea) -Commit: https://github.com/plone/plone.restapi/commit/0c24548ba531fb5445563ff717f6f38801455c22 +Branch: refs/heads/1.x +Date: 2021-02-19T07:55:15-06:00 +Author: Johannes Raggam (thet) +Commit: https://github.com/plone/plone.staticresources/commit/2f31803b187065e3b0f467e82afa9f69403da2c8 -Avoid duplicate fields from multiple behaviors - refs #1073 (#1074) +Include upgrade step 12, which was missing. Files changed: -A news/1073.bugfix -M src/plone/restapi/types/utils.py +A news/123.bugfix +M src/plone/staticresources/setuphandlers.py +M src/plone/staticresources/upgrades/configure.zcml -b'diff --git a/news/1073.bugfix b/news/1073.bugfix\nnew file mode 100644\nindex 000000000..010645d01\n--- /dev/null\n+++ b/news/1073.bugfix\n@@ -0,0 +1,2 @@\n+Avoid duplicate fields within DX RestAPI\n+[avoinea]\ndiff --git a/src/plone/restapi/types/utils.py b/src/plone/restapi/types/utils.py\nindex bac7e0f24..40a799bc4 100644\n--- a/src/plone/restapi/types/utils.py\n+++ b/src/plone/restapi/types/utils.py\n@@ -78,6 +78,7 @@ class SchemaForm(AutoExtensibleForm, z3c_form.AddForm):\n schema = base_schema\n additionalSchemata = additional_schemata\n ignoreContext = True\n+ ignorePrefix = True\n \n form = SchemaForm(context, request)\n form.updateFieldsFromSchemata()\n' +b'diff --git a/news/123.bugfix b/news/123.bugfix\nnew file mode 100644\nindex 00000000..5b35f12a\n--- /dev/null\n+++ b/news/123.bugfix\n@@ -0,0 +1,2 @@\n+Include upgrade step 12, which was missing.\n+[thet]\ndiff --git a/src/plone/staticresources/setuphandlers.py b/src/plone/staticresources/setuphandlers.py\nindex 6b064be2..7136d63c 100644\n--- a/src/plone/staticresources/setuphandlers.py\n+++ b/src/plone/staticresources/setuphandlers.py\n@@ -29,4 +29,5 @@ def getNonInstallableProfiles(self):\n "plone.staticresources.upgrades:9",\n "plone.staticresources.upgrades:10",\n "plone.staticresources.upgrades:11",\n+ "plone.staticresources.upgrades:12",\n ]\ndiff --git a/src/plone/staticresources/upgrades/configure.zcml b/src/plone/staticresources/upgrades/configure.zcml\nindex a62744c3..2c2d0f09 100644\n--- a/src/plone/staticresources/upgrades/configure.zcml\n+++ b/src/plone/staticresources/upgrades/configure.zcml\n@@ -12,5 +12,6 @@\n \n \n \n+ \n \n \n' + +Repository: plone.staticresources + + +Branch: refs/heads/1.x +Date: 2021-02-19T07:55:15-06:00 +Author: Peter Mathis (petschki) +Commit: https://github.com/plone/plone.staticresources/commit/5d3a0b8303f273a7c79b2f3c3d6c3c755d00763d + +remove wrong bundle with typo + +Files changed: +A src/plone/staticresources/upgrades/13.zcml +A src/plone/staticresources/upgrades/profiles/13/registry.xml +M news/123.bugfix +M src/plone/staticresources/profiles/default/metadata.xml +M src/plone/staticresources/upgrades/configure.zcml + +b'diff --git a/news/123.bugfix b/news/123.bugfix\nindex 5b35f12a..b1a31e76 100644\n--- a/news/123.bugfix\n+++ b/news/123.bugfix\n@@ -1,2 +1,5 @@\n Include upgrade step 12, which was missing.\n [thet]\n+\n+Remove bundle with typo.\n+[petschki]\ndiff --git a/src/plone/staticresources/profiles/default/metadata.xml b/src/plone/staticresources/profiles/default/metadata.xml\nindex a6ee2fc0..6ed29f19 100644\n--- a/src/plone/staticresources/profiles/default/metadata.xml\n+++ b/src/plone/staticresources/profiles/default/metadata.xml\n@@ -1,6 +1,6 @@\n \n \n- 12\n+ 13\n \n profile-plone.resource:default\n \ndiff --git a/src/plone/staticresources/upgrades/13.zcml b/src/plone/staticresources/upgrades/13.zcml\nnew file mode 100644\nindex 00000000..4d41bfa2\n--- /dev/null\n+++ b/src/plone/staticresources/upgrades/13.zcml\n@@ -0,0 +1,19 @@\n+\n+\n+ \n+\n+ \n+\n+\ndiff --git a/src/plone/staticresources/upgrades/configure.zcml b/src/plone/staticresources/upgrades/configure.zcml\nindex 2c2d0f09..7355ff9c 100644\n--- a/src/plone/staticresources/upgrades/configure.zcml\n+++ b/src/plone/staticresources/upgrades/configure.zcml\n@@ -13,5 +13,6 @@\n \n \n \n+ \n \n \ndiff --git a/src/plone/staticresources/upgrades/profiles/13/registry.xml b/src/plone/staticresources/upgrades/profiles/13/registry.xml\nnew file mode 100644\nindex 00000000..62a0d88b\n--- /dev/null\n+++ b/src/plone/staticresources/upgrades/profiles/13/registry.xml\n@@ -0,0 +1,4 @@\n+\n+\n+ \n+\n' + +Repository: plone.staticresources + + +Branch: refs/heads/1.x +Date: 2021-02-19T07:55:15-06:00 +Author: Peter Mathis (petschki) +Commit: https://github.com/plone/plone.staticresources/commit/bc887dc9b08ea4cdbe689890de0e5d6e67a3202d + +update non installable profiles + +Files changed: +M src/plone/staticresources/setuphandlers.py + +b'diff --git a/src/plone/staticresources/setuphandlers.py b/src/plone/staticresources/setuphandlers.py\nindex 7136d63c..21a922cf 100644\n--- a/src/plone/staticresources/setuphandlers.py\n+++ b/src/plone/staticresources/setuphandlers.py\n@@ -30,4 +30,5 @@ def getNonInstallableProfiles(self):\n "plone.staticresources.upgrades:10",\n "plone.staticresources.upgrades:11",\n "plone.staticresources.upgrades:12",\n+ "plone.staticresources.upgrades:13",\n ]\n'