-
-
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.
Branch: refs/heads/master Date: 2017-09-11T21:12:26+02:00 Author: Philip Bauer (pbauer) <[email protected]> Commit: plone/plone.app.upgrade@9354a25 Use str() when migrating checkout_workflow_policy since the field is ASCII Files changed: M CHANGES.rst M plone/app/upgrade/v50/betas.py Repository: plone.app.upgrade Branch: refs/heads/master Date: 2017-09-16T12:30:57+02:00 Author: Philip Bauer (pbauer) <[email protected]> Commit: plone/plone.app.upgrade@973855e Merge pull request #136 from plone/workon_checkout_workflow_policy_issues Use str() when migrating checkout_workflow_policy Files changed: M CHANGES.rst M plone/app/upgrade/v50/betas.py
- Loading branch information
Showing
1 changed file
with
54 additions
and
84 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,118 +1,88 @@ | ||
| Repository: Products.CMFPlone | ||
| Repository: plone.app.upgrade | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-09-13T10:05:41+02:00 | ||
| Author: Johannes Raggam (thet) <[email protected]> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/c2fbfa2d9022d15be8608803a4a0e7e92e4ac559 | ||
| Date: 2017-09-11T21:12:26+02:00 | ||
| Author: Philip Bauer (pbauer) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/9354a25e3897855cead4b92844beeda2ef4c3611 | ||
|
|
||
| Bump metadata.xml version. | ||
| Use str() when migrating checkout_workflow_policy since the field is ASCII | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M Products/CMFPlone/profiles/default/metadata.xml | ||
| M plone/app/upgrade/v50/betas.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 36d598ad9..88c38f620 100644 | ||
| index bdc8e5d..97bf926 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -18,7 +18,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Bump metadata.xml version. | ||
| + [thet] | ||
|
|
||
| @@ -17,6 +17,9 @@ Bug fixes: | ||
| - Register settings for safe_html-Transform when migrating from 5107 to 5108 | ||
| [pbauer] | ||
|
|
||
| 5.1rc1 (2017-09-10) | ||
| @@ -40,7 +41,7 @@ New features: | ||
| +- Use str() when migrating checkout_workflow_policy since the field is ASCII. | ||
| + See discussion at https://github.com/plone/plone.app.iterate/pull/53 | ||
| + [pbauer] | ||
|
|
||
| - Update ``plone-legacy-compiled.js`` and ``plone-legacy-compiled.css``. | ||
| [thet] | ||
| - | ||
| + | ||
| - Update mockup to latest version. | ||
| [thet] | ||
| 2.0.7 (2017-09-10) | ||
| ------------------ | ||
| diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py | ||
| index d246b8c..59412f4 100644 | ||
| --- a/plone/app/upgrade/v50/betas.py | ||
| +++ b/plone/app/upgrade/v50/betas.py | ||
| @@ -570,7 +570,7 @@ def to50rc3(context): | ||
| value = site_properties.getProperty('checkout_workflow_policy') | ||
| from plone.app.iterate.interfaces import IIterateSettings | ||
| settings = registry.forInterface(IIterateSettings) | ||
| - settings.checkout_workflow_policy = safe_unicode(value) | ||
| + settings.checkout_workflow_policy = str(value) | ||
| site_properties._delProperty('checkout_workflow_policy') | ||
|
|
||
| @@ -61,7 +62,7 @@ Bug fixes: | ||
| - Recover missing dashboard (user actions) | ||
| https://github.com/plone/Products.CMFPlone/issues/1132 | ||
| [fgrcon] | ||
| - | ||
| + | ||
| - Remove the right padding on toolbar submenu entries. | ||
| That looked a bit weird. | ||
| [thet] | ||
| diff --git a/Products/CMFPlone/profiles/default/metadata.xml b/Products/CMFPlone/profiles/default/metadata.xml | ||
| index 6019047a9..9fde2f7e2 100644 | ||
| --- a/Products/CMFPlone/profiles/default/metadata.xml | ||
| +++ b/Products/CMFPlone/profiles/default/metadata.xml | ||
| @@ -1,4 +1,4 @@ | ||
| <?xml version="1.0"?> | ||
| <metadata> | ||
| - <version>5108</version> | ||
| + <version>5109</version> | ||
| </metadata> | ||
| if site_properties.hasProperty('default_page_types'): | ||
|
|
||
|
|
||
| Repository: Products.CMFPlone | ||
| Repository: plone.app.upgrade | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-09-16T12:04:10+02:00 | ||
| Date: 2017-09-16T12:30:57+02:00 | ||
| Author: Philip Bauer (pbauer) <[email protected]> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/4274a04a8ce19241adb89b5422807a0776d854bb | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/973855ea500f7371a12079b3d247b960049be8e7 | ||
|
|
||
| Merge pull request #2144 from plone/thet-rc1version | ||
| Merge pull request #136 from plone/workon_checkout_workflow_policy_issues | ||
|
|
||
| Bump metadata.xml version. | ||
| Use str() when migrating checkout_workflow_policy | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M Products/CMFPlone/profiles/default/metadata.xml | ||
| M plone/app/upgrade/v50/betas.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 36d598ad9..88c38f620 100644 | ||
| index 19251d8..fc3663c 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -18,7 +18,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Bump metadata.xml version. | ||
| + [thet] | ||
|
|
||
| @@ -24,6 +24,9 @@ Bug fixes: | ||
| - Register settings for safe_html-Transform when migrating from 5107 to 5108 | ||
| [pbauer] | ||
|
|
||
| 5.1rc1 (2017-09-10) | ||
| @@ -40,7 +41,7 @@ New features: | ||
| +- Use str() when migrating checkout_workflow_policy since the field is ASCII. | ||
| + See discussion at https://github.com/plone/plone.app.iterate/pull/53 | ||
| + [pbauer] | ||
|
|
||
| - Update ``plone-legacy-compiled.js`` and ``plone-legacy-compiled.css``. | ||
| [thet] | ||
| - | ||
| + | ||
| - Update mockup to latest version. | ||
| [thet] | ||
| 2.0.7 (2017-09-10) | ||
| ------------------ | ||
| diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py | ||
| index d246b8c..59412f4 100644 | ||
| --- a/plone/app/upgrade/v50/betas.py | ||
| +++ b/plone/app/upgrade/v50/betas.py | ||
| @@ -570,7 +570,7 @@ def to50rc3(context): | ||
| value = site_properties.getProperty('checkout_workflow_policy') | ||
| from plone.app.iterate.interfaces import IIterateSettings | ||
| settings = registry.forInterface(IIterateSettings) | ||
| - settings.checkout_workflow_policy = safe_unicode(value) | ||
| + settings.checkout_workflow_policy = str(value) | ||
| site_properties._delProperty('checkout_workflow_policy') | ||
|
|
||
| @@ -61,7 +62,7 @@ Bug fixes: | ||
| - Recover missing dashboard (user actions) | ||
| https://github.com/plone/Products.CMFPlone/issues/1132 | ||
| [fgrcon] | ||
| - | ||
| + | ||
| - Remove the right padding on toolbar submenu entries. | ||
| That looked a bit weird. | ||
| [thet] | ||
| diff --git a/Products/CMFPlone/profiles/default/metadata.xml b/Products/CMFPlone/profiles/default/metadata.xml | ||
| index 6019047a9..9fde2f7e2 100644 | ||
| --- a/Products/CMFPlone/profiles/default/metadata.xml | ||
| +++ b/Products/CMFPlone/profiles/default/metadata.xml | ||
| @@ -1,4 +1,4 @@ | ||
| <?xml version="1.0"?> | ||
| <metadata> | ||
| - <version>5108</version> | ||
| + <version>5109</version> | ||
| </metadata> | ||
| if site_properties.hasProperty('default_page_types'): | ||
|
|
||
|
|