Skip to content

Commit

Permalink
[fc] Repository: plone.app.discussion
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2018-08-08T13:46:16+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.discussion@76f4f50

get rid of plone.app.controlpanel dependencies

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/subscribers.zcml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2018-08-09T18:11:44+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.discussion@a7d95a9

Merge pull request #137 from plone/jensens/get-rid-of-p.a.controlpanel

get rid of plone.app.controlpanel dependencies

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/subscribers.zcml
  • Loading branch information
@jensens
jensens committed Aug 9, 2018
1 parent b823679 commit 9c97003
Showing 1 changed file with 15 additions and 13 deletions.
28 changes: 15 additions & 13 deletions last_commit.txt
View file
@@ -1,34 +1,36 @@
Repository: plone.app.theming
Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2018-08-08T12:39:57+02:00
Date: 2018-08-08T13:46:16+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.theming/commit/6140ed8221db55b90c312b22f0c59fb9a7c49657
Commit: https://github.com/plone/plone.app.discussion/commit/76f4f501606b3ba94cb750426a123707661a30d8

Explizit load permissions for controlpanel.
get rid of plone.app.controlpanel dependencies

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/configure.zcml
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/subscribers.zcml

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 004b6ba..186cf2e 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,6 +14,9 @@ New features:\n \n Bug fixes:\n \n+- Explizit load permissions for controlpanel.\n+ [jensens]\n+\n - Fix tests for merged plone.login. \n [jensens]\n \ndiff --git a/src/plone/app/theming/browser/configure.zcml b/src/plone/app/theming/browser/configure.zcml\nindex 1e15f72..5c03db4 100644\n--- a/src/plone/app/theming/browser/configure.zcml\n+++ b/src/plone/app/theming/browser/configure.zcml\n@@ -4,6 +4,8 @@\n xmlns:i18n="http://namespaces.zope.org/i18n"\n i18n_domain="plone">\n \n+ <include package="Products.CMFPlone.controlpanel" file="permissions.zcml" />\n+\n <browser:resource\n name="plone.app.theming.gif"\n image="icon.gif"\n'
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 0a8f3fd9..be4873e8 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -15,6 +15,9 @@ New features:\n \n Bug fixes:\n \n+- Fix location of controlpanel events.\n+ [jensens]\n+\n - Fixed tests when IRichText behavior is used.\n IRichText -> IRichTextBehavior\n This is a follow up to `issue 476 <https://github.com/plone/plone.app.contenttypes/issues/476>`_.\ndiff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py\nindex 3c88ebe3..5e904d80 100644\n--- a/plone/app/discussion/browser/controlpanel.py\n+++ b/plone/app/discussion/browser/controlpanel.py\n@@ -1,5 +1,4 @@\n # -*- coding: utf-8 -*-\n-from plone.app.controlpanel.interfaces import IConfigurationChangedEvent\n from plone.app.discussion.interfaces import _\n from plone.app.discussion.interfaces import IDiscussionSettings\n from plone.app.discussion.upgrades import update_registry\n@@ -7,6 +6,7 @@\n from plone.registry.interfaces import IRecordModifiedEvent\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.utils import getToolByName\n+from Products.CMFPlone.interfaces.controlpanel import IConfigurationChangedEvent # noqa: E501\n from Products.CMFPlone.interfaces.controlpanel import IMailSchema\n from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile\n from Products.statusmessages.interfaces import IStatusMessage\ndiff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml\nindex 5bb35353..20e1b7f5 100644\n--- a/plone/app/discussion/subscribers.zcml\n+++ b/plone/app/discussion/subscribers.zcml\n@@ -66,7 +66,7 @@\n <!-- Control panel event subscribers -->\n \n <subscriber\n- for="plone.app.controlpanel.interfaces.IConfigurationChangedEvent"\n+ for="Products.CMFPlone.interfaces.events.IConfigurationChangedEvent"\n handler=".browser.controlpanel.notify_configuration_changed"\n />\n \n'

Repository: plone.app.theming
Repository: plone.app.discussion


Branch: refs/heads/master
Date: 2018-08-09T18:10:13+02:00
Date: 2018-08-09T18:11:44+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.theming/commit/98a21c0aeeadb420570224269974d23b65fc43be
Commit: https://github.com/plone/plone.app.discussion/commit/a7d95a9449aece02b8919d322f9d4ca58b5fdbd4

Merge pull request #145 from plone/jensens/make-p.a.controlpanel-obsolete
Merge pull request #137 from plone/jensens/get-rid-of-p.a.controlpanel

Explizit load permissions for controlpanel.
get rid of plone.app.controlpanel dependencies

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/configure.zcml
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/subscribers.zcml

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 004b6ba..186cf2e 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,6 +14,9 @@ New features:\n \n Bug fixes:\n \n+- Explizit load permissions for controlpanel.\n+ [jensens]\n+\n - Fix tests for merged plone.login. \n [jensens]\n \ndiff --git a/src/plone/app/theming/browser/configure.zcml b/src/plone/app/theming/browser/configure.zcml\nindex 1e15f72..5c03db4 100644\n--- a/src/plone/app/theming/browser/configure.zcml\n+++ b/src/plone/app/theming/browser/configure.zcml\n@@ -4,6 +4,8 @@\n xmlns:i18n="http://namespaces.zope.org/i18n"\n i18n_domain="plone">\n \n+ <include package="Products.CMFPlone.controlpanel" file="permissions.zcml" />\n+\n <browser:resource\n name="plone.app.theming.gif"\n image="icon.gif"\n'
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 0a8f3fd9..be4873e8 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -15,6 +15,9 @@ New features:\n \n Bug fixes:\n \n+- Fix location of controlpanel events.\n+ [jensens]\n+\n - Fixed tests when IRichText behavior is used.\n IRichText -> IRichTextBehavior\n This is a follow up to `issue 476 <https://github.com/plone/plone.app.contenttypes/issues/476>`_.\ndiff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py\nindex 3c88ebe3..5e904d80 100644\n--- a/plone/app/discussion/browser/controlpanel.py\n+++ b/plone/app/discussion/browser/controlpanel.py\n@@ -1,5 +1,4 @@\n # -*- coding: utf-8 -*-\n-from plone.app.controlpanel.interfaces import IConfigurationChangedEvent\n from plone.app.discussion.interfaces import _\n from plone.app.discussion.interfaces import IDiscussionSettings\n from plone.app.discussion.upgrades import update_registry\n@@ -7,6 +6,7 @@\n from plone.registry.interfaces import IRecordModifiedEvent\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.utils import getToolByName\n+from Products.CMFPlone.interfaces.controlpanel import IConfigurationChangedEvent # noqa: E501\n from Products.CMFPlone.interfaces.controlpanel import IMailSchema\n from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile\n from Products.statusmessages.interfaces import IStatusMessage\ndiff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml\nindex 5bb35353..20e1b7f5 100644\n--- a/plone/app/discussion/subscribers.zcml\n+++ b/plone/app/discussion/subscribers.zcml\n@@ -66,7 +66,7 @@\n <!-- Control panel event subscribers -->\n \n <subscriber\n- for="plone.app.controlpanel.interfaces.IConfigurationChangedEvent"\n+ for="Products.CMFPlone.interfaces.events.IConfigurationChangedEvent"\n handler=".browser.controlpanel.notify_configuration_changed"\n />\n \n'

0 comments on commit 9c97003

Please sign in to comment.