Skip to content

Commit

Permalink
[fc] Repository: plone.app.discussion
Browse files Browse the repository at this point in the history 
Branch: refs/heads/3.4.x
Date: 2022-05-10T21:46:35+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.app.discussion@4acadac

Grant Site Administrators the same workflow permissions as Managers.

They were missing permissions on pending comments.
Fixes plone/plone.app.discussion#199

Files changed:
A news/199.bugfix
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/upgrades.zcml
Repository: plone.app.discussion

Branch: refs/heads/3.4.x
Date: 2022-05-10T23:00:32+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.discussion@2c450be

Merge pull request #201 from plone/maurits-site-administrators-52

Grant Site Administrators same workflow permissions as Managers [5.2]

Files changed:
A news/199.bugfix
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/upgrades.zcml
  • Loading branch information
@jensens
jensens committed May 10, 2022
1 parent a4adc31 commit dd82a93
Showing 1 changed file with 25 additions and 47 deletions.
72 changes: 25 additions & 47 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,41 @@
Repository: plone.app.dexterity
Repository: plone.app.discussion


Branch: refs/heads/2.6.x
Date: 2022-05-09T16:28:07+02:00
Author: Peter Holzer (agitator) <peter.holzer@agitator.com>
Commit: https://github.com/plone/plone.app.dexterity/commit/675cc10b1b2045021dd79d58103f13490af9ce73

Don't acquire .language from portal root.

Files changed:
M plone/app/dexterity/behaviors/metadata.py

b"diff --git a/plone/app/dexterity/behaviors/metadata.py b/plone/app/dexterity/behaviors/metadata.py\nindex b4961de..b260783 100644\n--- a/plone/app/dexterity/behaviors/metadata.py\n+++ b/plone/app/dexterity/behaviors/metadata.py\n@@ -44,25 +44,29 @@ def default_language(context):\n # this new content is being added\n language = None\n \n- if context is not None and not IPloneSiteRoot.providedBy(context):\n- language = context.Language()\n- if not language:\n+ # Try to get the language from context or parent(s)\n+ while context is not None and not IPloneSiteRoot.providedBy(context):\n+ try:\n+ # Use aq_base so the .language attribute isn't acquired from root\n+ language = context.aq_base.Language()\n+ except AttributeError: # Accesses .language\n # If we are here, it means we were editing an object that didn't\n # have its language set or that the container where we were adding\n # the new content didn't have a language set. So we check its\n- # parent, unless we are at site's root, in which case we get site's\n- # default language\n- if not IPloneSiteRoot.providedBy(context.aq_parent):\n- language = context.aq_parent.Language()\n+ # parent.\n+ context = context.__parent__\n+\n+ pl = getToolByName(getSite(), 'portal_languages')\n+ default_language = pl.getDefaultLanguage()\n \n if not language:\n- # Finally, if we still don't have a language, then just use site's\n- # default\n- pl = getToolByName(getSite(), 'portal_languages')\n- language = pl.getDefaultLanguage()\n+ language = default_language\n \n- return language\n+ # Is the language supported/enabled at all?\n+ if language not in pl.getAvailableLanguages():\n+ language = default_language\n \n+ return language\n \n @provider(IFormFieldProvider)\n class IBasic(model.Schema):\n"

Repository: plone.app.dexterity


Branch: refs/heads/2.6.x
Date: 2022-05-09T16:33:59+02:00
Author: Peter Holzer (agitator) <peter.holzer@agitator.com>
Commit: https://github.com/plone/plone.app.dexterity/commit/adb7d35b7c8ea9912c7df16e562925ec6250bf7a

add news

Files changed:
A news/351.bugfix

b"diff --git a/news/351.bugfix b/news/351.bugfix\nnew file mode 100644\nindex 00000000..5eaa1972\n--- /dev/null\n+++ b/news/351.bugfix\n@@ -0,0 +1,3 @@\n+Don't acquire lanuage from portal root default_language for ICategorization.language.\n+Fixes https://github.com/plone/plone.app.dexterity/issues/258\n+[jaroel]\n\\ No newline at end of file\n"

Repository: plone.app.dexterity

Branch: refs/heads/3.4.x
Date: 2022-05-10T21:46:35+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.app.discussion/commit/4acadac5f3403ccf09997cebd9bebc8b9e58a270

Branch: refs/heads/2.6.x
Date: 2022-05-09T18:31:59+02:00
Author: Peter Holzer (agitator) <peter.holzer@agitator.com>
Commit: https://github.com/plone/plone.app.dexterity/commit/0bb52047a010b84210c70ec0c4253e95584da3e8
Grant Site Administrators the same workflow permissions as Managers.

use getattr
They were missing permissions on pending comments.
Fixes https://github.com/plone/plone.app.discussion/issues/199

Files changed:
M plone/app/dexterity/behaviors/metadata.py
A news/199.bugfix
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/upgrades.zcml

b"diff --git a/plone/app/dexterity/behaviors/metadata.py b/plone/app/dexterity/behaviors/metadata.py\nindex b260783..c89a9d8 100644\n--- a/plone/app/dexterity/behaviors/metadata.py\n+++ b/plone/app/dexterity/behaviors/metadata.py\n@@ -45,25 +45,24 @@ def default_language(context):\n language = None\n \n # Try to get the language from context or parent(s)\n- while context is not None and not IPloneSiteRoot.providedBy(context):\n- try:\n- # Use aq_base so the .language attribute isn't acquired from root\n- language = context.aq_base.Language()\n- except AttributeError: # Accesses .language\n+ while not language and context is not None and not IPloneSiteRoot.providedBy(context):\n+ language = getattr(context.aq_base, 'language', None)\n+\n+ if not language:\n # If we are here, it means we were editing an object that didn't\n # have its language set or that the container where we were adding\n # the new content didn't have a language set. So we check its\n # parent.\n context = context.__parent__\n \n- pl = getToolByName(getSite(), 'portal_languages')\n- default_language = pl.getDefaultLanguage()\n+ language_tool = getToolByName(getSite(), 'portal_languages')\n+ default_language = language_tool.getDefaultLanguage()\n \n if not language:\n language = default_language\n \n # Is the language supported/enabled at all?\n- if language not in pl.getAvailableLanguages():\n+ if language not in language_tool.getAvailableLanguages():\n language = default_language\n \n return language\n"
b'diff --git a/news/199.bugfix b/news/199.bugfix\nnew file mode 100644\nindex 00000000..4d0dd3ef\n--- /dev/null\n+++ b/news/199.bugfix\n@@ -0,0 +1,3 @@\n+Grant Site Administrators the same workflow permissions as Managers.\n+They were missing permissions on pending comments.\n+[maurits]\ndiff --git a/plone/app/discussion/profiles/default/metadata.xml b/plone/app/discussion/profiles/default/metadata.xml\nindex 49f2d5ec..727c28c5 100644\n--- a/plone/app/discussion/profiles/default/metadata.xml\n+++ b/plone/app/discussion/profiles/default/metadata.xml\n@@ -1,5 +1,5 @@\n <metadata>\n- <version>1002</version>\n+ <version>1003</version>\n <dependencies>\n <dependency>profile-plone.resource:default</dependency>\n <dependency>profile-plone.app.registry:default</dependency>\ndiff --git a/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml b/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml\nindex af19e9e3..439fdb60 100644\n--- a/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml\n+++ b/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml\n@@ -20,11 +20,13 @@\n <permission-role>Manager</permission-role>\n <permission-role>Owner</permission-role>\n <permission-role>Reviewer</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n <permission-map name="Modify portal content" acquired="False">\n <permission-role>Manager</permission-role>\n <permission-role>Owner</permission-role>\n <permission-role>Reviewer</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n <permission-map name="Reply to item" acquired="False">\n </permission-map>\n@@ -32,6 +34,7 @@\n <permission-role>Manager</permission-role>\n <permission-role>Owner</permission-role>\n <permission-role>Reviewer</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n </state>\n <state state_id="published" title="Published">\n@@ -43,6 +46,7 @@\n </permission-map>\n <permission-map name="Modify portal content" acquired="False">\n <permission-role>Manager</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n <permission-map name="Reply to item" acquired="True">\n </permission-map>\ndiff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml\nindex ae72b6ee..ce523f3b 100644\n--- a/plone/app/discussion/upgrades.zcml\n+++ b/plone/app/discussion/upgrades.zcml\n@@ -71,6 +71,14 @@\n description="Additional states allows moderator to review history of publishing and rejection"\n handler=".upgrades.extend_review_workflow"\n />\n-</genericsetup:upgradeSteps>\n+ </genericsetup:upgradeSteps>\n+\n+ <genericsetup:upgradeStep\n+ source="1002"\n+ destination="1003"\n+ profile="plone.app.discussion:default"\n+ title="Grant Site Administrator permissions on pending comments"\n+ handler=".upgrades.upgrade_comment_workflows"\n+ />\n \n </configure>\n'

Repository: plone.app.dexterity
Repository: plone.app.discussion


Branch: refs/heads/2.6.x
Date: 2022-05-09T23:02:03+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.app.dexterity/commit/83b2e0cba8c14699a4b18cb9eede64d5cd6f0c41
Branch: refs/heads/3.4.x
Date: 2022-05-10T23:00:32+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.discussion/commit/2c450becef8378e534743ebd07f96b6d7834202b

Merge pull request #351 from plone/defaultlanglookup-p5
Merge pull request #201 from plone/maurits-site-administrators-52

[5.2] Don't acquire .language from portal root.
Grant Site Administrators same workflow permissions as Managers [5.2]

Files changed:
A news/351.bugfix
M plone/app/dexterity/behaviors/metadata.py
A news/199.bugfix
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/upgrades.zcml

b"diff --git a/news/351.bugfix b/news/351.bugfix\nnew file mode 100644\nindex 00000000..5eaa1972\n--- /dev/null\n+++ b/news/351.bugfix\n@@ -0,0 +1,3 @@\n+Don't acquire lanuage from portal root default_language for ICategorization.language.\n+Fixes https://github.com/plone/plone.app.dexterity/issues/258\n+[jaroel]\n\\ No newline at end of file\ndiff --git a/plone/app/dexterity/behaviors/metadata.py b/plone/app/dexterity/behaviors/metadata.py\nindex b4961de1..c89a9d84 100644\n--- a/plone/app/dexterity/behaviors/metadata.py\n+++ b/plone/app/dexterity/behaviors/metadata.py\n@@ -44,25 +44,28 @@ def default_language(context):\n # this new content is being added\n language = None\n \n- if context is not None and not IPloneSiteRoot.providedBy(context):\n- language = context.Language()\n+ # Try to get the language from context or parent(s)\n+ while not language and context is not None and not IPloneSiteRoot.providedBy(context):\n+ language = getattr(context.aq_base, 'language', None)\n+\n if not language:\n # If we are here, it means we were editing an object that didn't\n # have its language set or that the container where we were adding\n # the new content didn't have a language set. So we check its\n- # parent, unless we are at site's root, in which case we get site's\n- # default language\n- if not IPloneSiteRoot.providedBy(context.aq_parent):\n- language = context.aq_parent.Language()\n+ # parent.\n+ context = context.__parent__\n+\n+ language_tool = getToolByName(getSite(), 'portal_languages')\n+ default_language = language_tool.getDefaultLanguage()\n \n if not language:\n- # Finally, if we still don't have a language, then just use site's\n- # default\n- pl = getToolByName(getSite(), 'portal_languages')\n- language = pl.getDefaultLanguage()\n+ language = default_language\n \n- return language\n+ # Is the language supported/enabled at all?\n+ if language not in language_tool.getAvailableLanguages():\n+ language = default_language\n \n+ return language\n \n @provider(IFormFieldProvider)\n class IBasic(model.Schema):\n"
b'diff --git a/news/199.bugfix b/news/199.bugfix\nnew file mode 100644\nindex 00000000..4d0dd3ef\n--- /dev/null\n+++ b/news/199.bugfix\n@@ -0,0 +1,3 @@\n+Grant Site Administrators the same workflow permissions as Managers.\n+They were missing permissions on pending comments.\n+[maurits]\ndiff --git a/plone/app/discussion/profiles/default/metadata.xml b/plone/app/discussion/profiles/default/metadata.xml\nindex 49f2d5ec..727c28c5 100644\n--- a/plone/app/discussion/profiles/default/metadata.xml\n+++ b/plone/app/discussion/profiles/default/metadata.xml\n@@ -1,5 +1,5 @@\n <metadata>\n- <version>1002</version>\n+ <version>1003</version>\n <dependencies>\n <dependency>profile-plone.resource:default</dependency>\n <dependency>profile-plone.app.registry:default</dependency>\ndiff --git a/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml b/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml\nindex af19e9e3..439fdb60 100644\n--- a/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml\n+++ b/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml\n@@ -20,11 +20,13 @@\n <permission-role>Manager</permission-role>\n <permission-role>Owner</permission-role>\n <permission-role>Reviewer</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n <permission-map name="Modify portal content" acquired="False">\n <permission-role>Manager</permission-role>\n <permission-role>Owner</permission-role>\n <permission-role>Reviewer</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n <permission-map name="Reply to item" acquired="False">\n </permission-map>\n@@ -32,6 +34,7 @@\n <permission-role>Manager</permission-role>\n <permission-role>Owner</permission-role>\n <permission-role>Reviewer</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n </state>\n <state state_id="published" title="Published">\n@@ -43,6 +46,7 @@\n </permission-map>\n <permission-map name="Modify portal content" acquired="False">\n <permission-role>Manager</permission-role>\n+ <permission-role>Site Administrator</permission-role>\n </permission-map>\n <permission-map name="Reply to item" acquired="True">\n </permission-map>\ndiff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml\nindex ae72b6ee..ce523f3b 100644\n--- a/plone/app/discussion/upgrades.zcml\n+++ b/plone/app/discussion/upgrades.zcml\n@@ -71,6 +71,14 @@\n description="Additional states allows moderator to review history of publishing and rejection"\n handler=".upgrades.extend_review_workflow"\n />\n-</genericsetup:upgradeSteps>\n+ </genericsetup:upgradeSteps>\n+\n+ <genericsetup:upgradeStep\n+ source="1002"\n+ destination="1003"\n+ profile="plone.app.discussion:default"\n+ title="Grant Site Administrator permissions on pending comments"\n+ handler=".upgrades.upgrade_comment_workflows"\n+ />\n \n </configure>\n'

0 comments on commit dd82a93

Please sign in to comment.