-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.staticresources
Branch: refs/heads/1.x Date: 2021-02-19T07:55:15-06:00 Author: Johannes Raggam (thet) <[email protected]> Commit: plone/plone.staticresources@2f31803 Include upgrade step 12, which was missing. Files changed: A news/123.bugfix M src/plone/staticresources/setuphandlers.py M src/plone/staticresources/upgrades/configure.zcml Repository: plone.staticresources Branch: refs/heads/1.x Date: 2021-02-19T07:55:15-06:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.staticresources@5d3a0b8 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 Repository: plone.staticresources Branch: refs/heads/1.x Date: 2021-02-19T07:55:15-06:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.staticresources@bc887dc update non installable profiles Files changed: M src/plone/staticresources/setuphandlers.py
- Loading branch information
Showing
1 changed file
with
44 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) <contact@avoinea.com> | ||
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) <thetetet@gmail.com> | ||
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 <include file="9.zcml" />\n <include file="10.zcml" />\n <include file="11.zcml" />\n+ <include file="12.zcml" />\n \n </configure>\n' | ||
|
||
Repository: plone.staticresources | ||
|
||
|
||
Branch: refs/heads/1.x | ||
Date: 2021-02-19T07:55:15-06:00 | ||
Author: Peter Mathis (petschki) <[email protected]> | ||
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 <?xml version=\'1.0\' encoding=\'UTF-8\'?>\n <metadata>\n- <version>12</version>\n+ <version>13</version>\n <dependencies>\n <dependency>profile-plone.resource:default</dependency>\n </dependencies>\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+<configure xmlns="http://namespaces.zope.org/zope"\n+ xmlns:gs="http://namespaces.zope.org/genericsetup">\n+\n+ <gs:registerProfile name="13"\n+ title="Update bundles"\n+ description=\'Configuration for version 13\'\n+ directory="profiles/13"\n+ for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"\n+ provides="Products.GenericSetup.interfaces.EXTENSION" />\n+\n+ <gs:upgradeDepends\n+ source="12"\n+ destination="13"\n+ profile="plone.staticresources:default"\n+ title="Remove wrong bundle from upgrade profile 11"\n+ import_profile="plone.staticresources.upgrades:13"\n+ />\n+\n+</configure>\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 <include file="10.zcml" />\n <include file="11.zcml" />\n <include file="12.zcml" />\n+ <include file="13.zcml" />\n \n </configure>\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+<?xml version=\'1.0\' encoding=\'UTF-8\'?>\n+<registry>\n+ <records remove="True" prefix="plone.bundles/resourceregistryt" interface=\'Products.CMFPlone.interfaces.IBundleRegistry\' />\n+</registry>\n' | ||
|
||
Repository: plone.staticresources | ||
|
||
|
||
Branch: refs/heads/1.x | ||
Date: 2021-02-19T07:55:15-06:00 | ||
Author: Peter Mathis (petschki) <[email protected]> | ||
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' | ||
|