-
-
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: 2018-01-30T18:29:06+01:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/plone.app.upgrade@fbac3e8 Import setupPasswordPolicyPlugin from canonical place in PlonePAS. Files changed: M CHANGES.rst M plone/app/upgrade/v43/final.py M setup.py Repository: plone.app.upgrade Branch: refs/heads/master Date: 2018-01-30T23:41:10+01:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/plone.app.upgrade@dfe087d Merge pull request #148 from plone/plonepas-canonical-import-master Import setupPasswordPolicyPlugin from canonical place in PlonePAS. [master] Files changed: M CHANGES.rst M plone/app/upgrade/v43/final.py M setup.py
- Loading branch information
1 parent
621bb3a
commit 991fe42
Showing
1 changed file
with
72 additions
and
92 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,154 +1,134 @@ | ||
| Repository: borg.localrole | ||
| Repository: plone.app.upgrade | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-01-30T18:08:54+01:00 | ||
| Date: 2018-01-30T18:29:06+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/borg.localrole/commit/5eb0210591611dad173b8aa3a3d57ca49e60e222 | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/fbac3e82be730ec944b4d21943a9df941e67d3cc | ||
|
|
||
| Import `activatePluginInterfaces` from the canonical place in `Products.PlonePAS`. | ||
|
|
||
| This requires Products.PlonePAS 5.0.1 or later, which is used since Plone 4.3.8. | ||
| Import setupPasswordPolicyPlugin from canonical place in PlonePAS. | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M borg/localrole/utils.py | ||
| M plone/app/upgrade/v43/final.py | ||
| M setup.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index d3dc0d6..12eb0a9 100644 | ||
| index 6c6decea..6e2a0dd3 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,18 +14,21 @@ New features: | ||
| @@ -14,6 +14,9 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| +- Import ``activatePluginInterfaces`` from the canonical place in ``Products.PlonePAS``. | ||
| +- Import ``setupPasswordPolicyPlugin`` from canonical place in ``PlonePAS``. | ||
| + [maurits] | ||
| + | ||
| - Python 2 / 3 compat with six. | ||
| [jensens] | ||
| - Log progress and ignore bad catalog entries while updating catalog metadata. | ||
| [davisagli] | ||
|
|
||
| -- Cleanup: | ||
| +- Cleanup: | ||
| diff --git a/plone/app/upgrade/v43/final.py b/plone/app/upgrade/v43/final.py | ||
| index 08750b42..13b9317f 100644 | ||
| --- a/plone/app/upgrade/v43/final.py | ||
| +++ b/plone/app/upgrade/v43/final.py | ||
| @@ -44,7 +44,7 @@ def removePersistentKSSMimeTypeImportStep(context): | ||
|
|
||
| - - No self-contained buildout, | ||
| - - utf8-headers, | ||
| - - isort, | ||
| + - No self-contained buildout, | ||
| + - utf8-headers, | ||
| + - isort, | ||
| - ZCA-decorators | ||
| - formatting/readability/pep8, | ||
| - Security decorators | ||
| - | ||
| + | ||
| [jensens] | ||
| def addDefaultPlonePasswordPolicy(context): | ||
| portal = getToolByName(context, 'portal_url').getPortalObject() | ||
| - from Products.PlonePAS.Extensions.Install import setupPasswordPolicyPlugin | ||
| + from Products.PlonePAS.setuphandlers import setupPasswordPolicyPlugin | ||
| setupPasswordPolicyPlugin(portal) | ||
|
|
||
| - Fix test for Zope 4. | ||
| diff --git a/borg/localrole/utils.py b/borg/localrole/utils.py | ||
| index 6834f15..17ce009 100644 | ||
| --- a/borg/localrole/utils.py | ||
| +++ b/borg/localrole/utils.py | ||
| @@ -3,8 +3,8 @@ | ||
| from borg.localrole.config import LOCALROLE_PLUGIN_NAME | ||
| from borg.localrole.workspace import manage_addWorkspaceLocalRoleManager | ||
| from Products.CMFCore.utils import getToolByName | ||
| -from Products.PlonePAS.Extensions.Install import activatePluginInterfaces | ||
| from Products.PlonePAS.plugins.local_role import LocalRolesManager | ||
| +from Products.PlonePAS.setuphandlers import activatePluginInterfaces | ||
| from six import StringIO | ||
|
|
||
| @@ -323,7 +323,7 @@ def removeFakeKupu(context): | ||
|
|
||
| def addSortOnProperty(context): | ||
| """Add sort_on field to search controlpanel. | ||
| - | ||
| + | ||
| The default value of this field is relevance. | ||
| """ | ||
| site_properties = getToolByName(context, 'portal_properties').site_properties | ||
| diff --git a/setup.py b/setup.py | ||
| index 4ca9795..aec4790 100644 | ||
| index 6c8ded82..65864d98 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -39,7 +39,7 @@ | ||
| 'zope.interface', | ||
| 'Products.CMFCore', | ||
| 'Products.GenericSetup', | ||
| @@ -53,7 +53,7 @@ | ||
| 'Products.CMFEditions', | ||
| 'Products.CMFQuickInstallerTool', | ||
| 'Products.GenericSetup>=1.8.1', | ||
| - 'Products.PlonePAS', | ||
| + 'Products.PlonePAS >= 5.0.1', | ||
| 'Products.PluggableAuthService', | ||
| 'plone.memoize', | ||
| 'Acquisition', | ||
| 'Products.ZCatalog >= 2.13.4', | ||
| 'Zope2', | ||
|
|
||
|
|
||
| Repository: borg.localrole | ||
| Repository: plone.app.upgrade | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-01-30T21:47:22+01:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/borg.localrole/commit/43e995fd2a332b5f3123747314fdbe3054793a60 | ||
| Date: 2018-01-30T23:41:10+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.app.upgrade/commit/dfe087d240b9620210f314029033a2193d551f1d | ||
|
|
||
| Merge pull request #7 from plone/plonepas-canonical-import-master | ||
| Merge pull request #148 from plone/plonepas-canonical-import-master | ||
|
|
||
| Import activatePluginInterfaces from canonical place in PlonePAS [master] | ||
| Import setupPasswordPolicyPlugin from canonical place in PlonePAS. [master] | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M borg/localrole/utils.py | ||
| M plone/app/upgrade/v43/final.py | ||
| M setup.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index d3dc0d6..12eb0a9 100644 | ||
| index 6c6decea..6e2a0dd3 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,18 +14,21 @@ New features: | ||
| @@ -14,6 +14,9 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| +- Import ``activatePluginInterfaces`` from the canonical place in ``Products.PlonePAS``. | ||
| +- Import ``setupPasswordPolicyPlugin`` from canonical place in ``PlonePAS``. | ||
| + [maurits] | ||
| + | ||
| - Python 2 / 3 compat with six. | ||
| [jensens] | ||
| - Log progress and ignore bad catalog entries while updating catalog metadata. | ||
| [davisagli] | ||
|
|
||
| -- Cleanup: | ||
| +- Cleanup: | ||
| diff --git a/plone/app/upgrade/v43/final.py b/plone/app/upgrade/v43/final.py | ||
| index 08750b42..13b9317f 100644 | ||
| --- a/plone/app/upgrade/v43/final.py | ||
| +++ b/plone/app/upgrade/v43/final.py | ||
| @@ -44,7 +44,7 @@ def removePersistentKSSMimeTypeImportStep(context): | ||
|
|
||
| - - No self-contained buildout, | ||
| - - utf8-headers, | ||
| - - isort, | ||
| + - No self-contained buildout, | ||
| + - utf8-headers, | ||
| + - isort, | ||
| - ZCA-decorators | ||
| - formatting/readability/pep8, | ||
| - Security decorators | ||
| - | ||
| + | ||
| [jensens] | ||
| def addDefaultPlonePasswordPolicy(context): | ||
| portal = getToolByName(context, 'portal_url').getPortalObject() | ||
| - from Products.PlonePAS.Extensions.Install import setupPasswordPolicyPlugin | ||
| + from Products.PlonePAS.setuphandlers import setupPasswordPolicyPlugin | ||
| setupPasswordPolicyPlugin(portal) | ||
|
|
||
| - Fix test for Zope 4. | ||
| diff --git a/borg/localrole/utils.py b/borg/localrole/utils.py | ||
| index 6834f15..17ce009 100644 | ||
| --- a/borg/localrole/utils.py | ||
| +++ b/borg/localrole/utils.py | ||
| @@ -3,8 +3,8 @@ | ||
| from borg.localrole.config import LOCALROLE_PLUGIN_NAME | ||
| from borg.localrole.workspace import manage_addWorkspaceLocalRoleManager | ||
| from Products.CMFCore.utils import getToolByName | ||
| -from Products.PlonePAS.Extensions.Install import activatePluginInterfaces | ||
| from Products.PlonePAS.plugins.local_role import LocalRolesManager | ||
| +from Products.PlonePAS.setuphandlers import activatePluginInterfaces | ||
| from six import StringIO | ||
|
|
||
| @@ -323,7 +323,7 @@ def removeFakeKupu(context): | ||
|
|
||
| def addSortOnProperty(context): | ||
| """Add sort_on field to search controlpanel. | ||
| - | ||
| + | ||
| The default value of this field is relevance. | ||
| """ | ||
| site_properties = getToolByName(context, 'portal_properties').site_properties | ||
| diff --git a/setup.py b/setup.py | ||
| index 4ca9795..aec4790 100644 | ||
| index 6c8ded82..65864d98 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -39,7 +39,7 @@ | ||
| 'zope.interface', | ||
| 'Products.CMFCore', | ||
| 'Products.GenericSetup', | ||
| @@ -53,7 +53,7 @@ | ||
| 'Products.CMFEditions', | ||
| 'Products.CMFQuickInstallerTool', | ||
| 'Products.GenericSetup>=1.8.1', | ||
| - 'Products.PlonePAS', | ||
| + 'Products.PlonePAS >= 5.0.1', | ||
| 'Products.PluggableAuthService', | ||
| 'plone.memoize', | ||
| 'Acquisition', | ||
| 'Products.ZCatalog >= 2.13.4', | ||
| 'Zope2', | ||
|
|
||
|
|