-
-
Notifications
You must be signed in to change notification settings - Fork 76
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: 2016-01-07T12:54:25+01:00 Author: Gil Forcada Codinachs (gforcada) <gil.forcada@freitag.de> Commit: plone/Products.PlonePAS@51f055a Typo Files changed: M README.rst Repository: Products.PlonePAS Branch: refs/heads/master Date: 2016-01-08T09:29:56+01:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/Products.PlonePAS@aeb3e29 Merge pull request #14 from plone/gforcada-patch-1 Typo Files changed: M README.rst
- Loading branch information
Showing
1 changed file
with
35 additions
and
236 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,259 +1,58 @@ | ||
| Repository: plone.app.upgrade | ||
| Repository: Products.PlonePAS | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-01-06T13:34:23+01:00 | ||
| Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/3bcedea5f351a58b4f080918b28f4cd5b5398343 | ||
| Date: 2016-01-07T12:54:25+01:00 | ||
| Author: Gil Forcada Codinachs (gforcada) <gil.forcada@freitag.de> | ||
| Commit: https://github.com/plone/Products.PlonePAS/commit/51f055aebe38bf86d4393422ad7837ece821debc | ||
|
|
||
| Run missing upgrade-step of plone.app.querystring when upgrading to 5.0.2. | ||
| (and pep8) | ||
| Typo | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M plone/app/upgrade/v50/betas.py | ||
| M plone/app/upgrade/v50/configure.zcml | ||
| M plone/app/upgrade/v50/final.py | ||
| M README.rst | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 8f1372b..4c2c3d7 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -4,7 +4,8 @@ Changelog | ||
| 1.3.20 (unreleased) | ||
| ------------------- | ||
| diff --git a/README.rst b/README.rst | ||
| index b21a514..059c52d 100644 | ||
| --- a/README.rst | ||
| +++ b/README.rst | ||
| @@ -31,7 +31,7 @@ Why doesn't the title of my group, that I set in the ZMI, show up? | ||
| The title for a group comes from the properties plugin. | ||
| The info in the groups plugin isn't used, except for the name. | ||
|
|
||
| -- Nothing changed yet. | ||
| +- Run missing upgrade-step of plone.app.querystring when upgrading to 5.0.2. | ||
| + [pbauer] | ||
| - The value of the ``title``property on the ``portal_groupdata`` or ``portal_memberdata tools`` themselves (as opposed to the group or member data records within them) will not be used as a default for the title of the group or member. | ||
| + The value of the ``title`` property on the ``portal_groupdata`` or ``portal_memberdata tools`` themselves (as opposed to the group or member data records within them) will not be used as a default for the title of the group or member. | ||
| This is to prevent UI confusion if a title is set without realizing the implications. | ||
| To remove this special case, see ``plugins.property._getDefaultValues``. | ||
|
|
||
|
|
||
| 1.3.19 (2015-12-17) | ||
| @@ -15,8 +16,8 @@ New: | ||
| - reapply profile for site-controlpanel | ||
| plone/Products.CMFPlone#124 | ||
| [fgrcon] | ||
| - | ||
| -- extended step to501 to recreate metadata for getIcon, see | ||
| + | ||
| +- extended step to501 to recreate metadata for getIcon, see | ||
| plone/Products.CMFPlone#1226, #58, #60, #61 | ||
| [fgrcon, gagaro, jensens] | ||
|
|
||
| diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py | ||
| index c0dbd3a..e7eff8b 100644 | ||
| --- a/plone/app/upgrade/v50/betas.py | ||
| +++ b/plone/app/upgrade/v50/betas.py | ||
| @@ -59,17 +59,17 @@ def upgrade_portal_language(context): | ||
| lang_settings.use_combined_language_codes = portal_languages.use_combined_language_codes # noqa | ||
| lang_settings.display_flags = portal_languages.display_flags | ||
|
|
||
| - lang_settings.use_path_negotiation = portal_languages.use_path_negotiation | ||
| - lang_settings.use_content_negotiation = portal_languages.use_content_negotiation | ||
| - lang_settings.use_cookie_negotiation = portal_languages.use_cookie_negotiation | ||
| + lang_settings.use_path_negotiation = portal_languages.use_path_negotiation # noqa | ||
| + lang_settings.use_content_negotiation = portal_languages.use_content_negotiation # noqa | ||
| + lang_settings.use_cookie_negotiation = portal_languages.use_cookie_negotiation # noqa | ||
| if hasattr(portal_languages, 'set_cookie_everywhere'): | ||
| - lang_settings.set_cookie_always = portal_languages.set_cookie_everywhere | ||
| - lang_settings.authenticated_users_only = portal_languages.authenticated_users_only | ||
| - lang_settings.use_request_negotiation = portal_languages.use_request_negotiation | ||
| - lang_settings.use_cctld_negotiation = portal_languages.use_cctld_negotiation | ||
| + lang_settings.set_cookie_always = portal_languages.set_cookie_everywhere # noqa | ||
| + lang_settings.authenticated_users_only = portal_languages.authenticated_users_only # noqa | ||
| + lang_settings.use_request_negotiation = portal_languages.use_request_negotiation # noqa | ||
| + lang_settings.use_cctld_negotiation = portal_languages.use_cctld_negotiation # noqa | ||
| lang_settings.use_subdomain_negotiation = portal_languages.use_subdomain_negotiation # noqa | ||
| if hasattr(portal_languages, 'always_show_selector'): | ||
| - lang_settings.always_show_selector = portal_languages.always_show_selector | ||
| + lang_settings.always_show_selector = portal_languages.always_show_selector # noqa | ||
|
|
||
| # Remove the old tool | ||
| portal.manage_delObjects('portal_languages') | ||
| diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml | ||
| index ee73c59..b1bc42b 100644 | ||
| --- a/plone/app/upgrade/v50/configure.zcml | ||
| +++ b/plone/app/upgrade/v50/configure.zcml | ||
| @@ -270,4 +270,18 @@ | ||
| handler=".final.to501" | ||
| /> | ||
| </gs:upgradeSteps> | ||
| + | ||
| + <gs:upgradeSteps | ||
| + source="5012" | ||
| + destination="5013" | ||
| + profile="Products.CMFPlone:plone"> | ||
| + | ||
| + <gs:upgradeStep | ||
| + title="Run to502 upgrade profile." | ||
| + description="" | ||
| + handler=".final.to502" | ||
| + /> | ||
| + | ||
| + </gs:upgradeSteps> | ||
| + | ||
| </configure> | ||
| diff --git a/plone/app/upgrade/v50/final.py b/plone/app/upgrade/v50/final.py | ||
| index 01beec8..ffd33e4 100644 | ||
| --- a/plone/app/upgrade/v50/final.py | ||
| +++ b/plone/app/upgrade/v50/final.py | ||
| @@ -1,6 +1,5 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from plone.app.upgrade.utils import loadMigrationProfile | ||
| -from plone.dexterity.interfaces import IDexterityContent | ||
| from plone.registry.interfaces import IRegistry | ||
| from Products.CMFCore.utils import getToolByName | ||
| from Products.CMFPlone.utils import safe_unicode | ||
| @@ -65,7 +64,6 @@ def refresh_getIcon_catalog_metadata(context): | ||
| logger.info('`getIcon` not in metadata, skip upgrade step') | ||
| return | ||
|
|
||
| - | ||
| cnt = 0 | ||
| # search whole catalog | ||
| for brain in zcatalog.unrestrictedSearchResults(): | ||
| @@ -83,3 +81,12 @@ def refresh_getIcon_catalog_metadata(context): | ||
| logger.info('Reindexed `getIcon` for %s items' % str(cnt)) | ||
|
|
||
| refresh_getIcon_catalog_metadata(context) | ||
| + | ||
| + | ||
| +def to502(context): | ||
| + """5.0.1 -> 5.0.2""" | ||
| + | ||
| + # When migrating from Plone 4.3 to 5.0 the profile-version of | ||
| + # plone.app.querystring is 13 at this point but the upgrade-step | ||
| + # upgrade_to_5 has not been run. Let's run it. | ||
| + loadMigrationProfile(context, 'profile-plone.app.querystring:upgrade_to_5') | ||
|
|
||
|
|
||
| Repository: plone.app.upgrade | ||
| Repository: Products.PlonePAS | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-01-08T07:43:42+01:00 | ||
| Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/5512fa20813ae0959aea23df0cb44f86e2f6f7af | ||
| Date: 2016-01-08T09:29:56+01:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/Products.PlonePAS/commit/aeb3e2928b94d5c6a700c8d5869b77460245ed69 | ||
|
|
||
| Merge pull request #64 from plone/upgrade_querystring | ||
| Merge pull request #14 from plone/gforcada-patch-1 | ||
|
|
||
| Run missing upgrade-step of plone.app.querystring when upgrading to 5.0.2 | ||
| Typo | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M plone/app/upgrade/v50/betas.py | ||
| M plone/app/upgrade/v50/configure.zcml | ||
| M plone/app/upgrade/v50/final.py | ||
| M README.rst | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 8f1372b..4c2c3d7 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -4,7 +4,8 @@ Changelog | ||
| 1.3.20 (unreleased) | ||
| ------------------- | ||
|
|
||
| -- Nothing changed yet. | ||
| +- Run missing upgrade-step of plone.app.querystring when upgrading to 5.0.2. | ||
| + [pbauer] | ||
|
|
||
|
|
||
| 1.3.19 (2015-12-17) | ||
| @@ -15,8 +16,8 @@ New: | ||
| - reapply profile for site-controlpanel | ||
| plone/Products.CMFPlone#124 | ||
| [fgrcon] | ||
| - | ||
| -- extended step to501 to recreate metadata for getIcon, see | ||
| + | ||
| +- extended step to501 to recreate metadata for getIcon, see | ||
| plone/Products.CMFPlone#1226, #58, #60, #61 | ||
| [fgrcon, gagaro, jensens] | ||
|
|
||
| diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py | ||
| index c0dbd3a..e7eff8b 100644 | ||
| --- a/plone/app/upgrade/v50/betas.py | ||
| +++ b/plone/app/upgrade/v50/betas.py | ||
| @@ -59,17 +59,17 @@ def upgrade_portal_language(context): | ||
| lang_settings.use_combined_language_codes = portal_languages.use_combined_language_codes # noqa | ||
| lang_settings.display_flags = portal_languages.display_flags | ||
|
|
||
| - lang_settings.use_path_negotiation = portal_languages.use_path_negotiation | ||
| - lang_settings.use_content_negotiation = portal_languages.use_content_negotiation | ||
| - lang_settings.use_cookie_negotiation = portal_languages.use_cookie_negotiation | ||
| + lang_settings.use_path_negotiation = portal_languages.use_path_negotiation # noqa | ||
| + lang_settings.use_content_negotiation = portal_languages.use_content_negotiation # noqa | ||
| + lang_settings.use_cookie_negotiation = portal_languages.use_cookie_negotiation # noqa | ||
| if hasattr(portal_languages, 'set_cookie_everywhere'): | ||
| - lang_settings.set_cookie_always = portal_languages.set_cookie_everywhere | ||
| - lang_settings.authenticated_users_only = portal_languages.authenticated_users_only | ||
| - lang_settings.use_request_negotiation = portal_languages.use_request_negotiation | ||
| - lang_settings.use_cctld_negotiation = portal_languages.use_cctld_negotiation | ||
| + lang_settings.set_cookie_always = portal_languages.set_cookie_everywhere # noqa | ||
| + lang_settings.authenticated_users_only = portal_languages.authenticated_users_only # noqa | ||
| + lang_settings.use_request_negotiation = portal_languages.use_request_negotiation # noqa | ||
| + lang_settings.use_cctld_negotiation = portal_languages.use_cctld_negotiation # noqa | ||
| lang_settings.use_subdomain_negotiation = portal_languages.use_subdomain_negotiation # noqa | ||
| if hasattr(portal_languages, 'always_show_selector'): | ||
| - lang_settings.always_show_selector = portal_languages.always_show_selector | ||
| + lang_settings.always_show_selector = portal_languages.always_show_selector # noqa | ||
|
|
||
| # Remove the old tool | ||
| portal.manage_delObjects('portal_languages') | ||
| diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml | ||
| index ee73c59..b1bc42b 100644 | ||
| --- a/plone/app/upgrade/v50/configure.zcml | ||
| +++ b/plone/app/upgrade/v50/configure.zcml | ||
| @@ -270,4 +270,18 @@ | ||
| handler=".final.to501" | ||
| /> | ||
| </gs:upgradeSteps> | ||
| + | ||
| + <gs:upgradeSteps | ||
| + source="5012" | ||
| + destination="5013" | ||
| + profile="Products.CMFPlone:plone"> | ||
| + | ||
| + <gs:upgradeStep | ||
| + title="Run to502 upgrade profile." | ||
| + description="" | ||
| + handler=".final.to502" | ||
| + /> | ||
| + | ||
| + </gs:upgradeSteps> | ||
| + | ||
| </configure> | ||
| diff --git a/plone/app/upgrade/v50/final.py b/plone/app/upgrade/v50/final.py | ||
| index 01beec8..ffd33e4 100644 | ||
| --- a/plone/app/upgrade/v50/final.py | ||
| +++ b/plone/app/upgrade/v50/final.py | ||
| @@ -1,6 +1,5 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from plone.app.upgrade.utils import loadMigrationProfile | ||
| -from plone.dexterity.interfaces import IDexterityContent | ||
| from plone.registry.interfaces import IRegistry | ||
| from Products.CMFCore.utils import getToolByName | ||
| from Products.CMFPlone.utils import safe_unicode | ||
| @@ -65,7 +64,6 @@ def refresh_getIcon_catalog_metadata(context): | ||
| logger.info('`getIcon` not in metadata, skip upgrade step') | ||
| return | ||
| diff --git a/README.rst b/README.rst | ||
| index b21a514..059c52d 100644 | ||
| --- a/README.rst | ||
| +++ b/README.rst | ||
| @@ -31,7 +31,7 @@ Why doesn't the title of my group, that I set in the ZMI, show up? | ||
| The title for a group comes from the properties plugin. | ||
| The info in the groups plugin isn't used, except for the name. | ||
|
|
||
| - | ||
| cnt = 0 | ||
| # search whole catalog | ||
| for brain in zcatalog.unrestrictedSearchResults(): | ||
| @@ -83,3 +81,12 @@ def refresh_getIcon_catalog_metadata(context): | ||
| logger.info('Reindexed `getIcon` for %s items' % str(cnt)) | ||
| - The value of the ``title``property on the ``portal_groupdata`` or ``portal_memberdata tools`` themselves (as opposed to the group or member data records within them) will not be used as a default for the title of the group or member. | ||
| + The value of the ``title`` property on the ``portal_groupdata`` or ``portal_memberdata tools`` themselves (as opposed to the group or member data records within them) will not be used as a default for the title of the group or member. | ||
| This is to prevent UI confusion if a title is set without realizing the implications. | ||
| To remove this special case, see ``plugins.property._getDefaultValues``. | ||
|
|
||
| refresh_getIcon_catalog_metadata(context) | ||
| + | ||
| + | ||
| +def to502(context): | ||
| + """5.0.1 -> 5.0.2""" | ||
| + | ||
| + # When migrating from Plone 4.3 to 5.0 the profile-version of | ||
| + # plone.app.querystring is 13 at this point but the upgrade-step | ||
| + # upgrade_to_5 has not been run. Let's run it. | ||
| + loadMigrationProfile(context, 'profile-plone.app.querystring:upgrade_to_5') | ||
|
|
||
|
|