From 245a2d9be32be275b86642a8dd6c32f553469d18 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Tue, 10 May 2022 16:49:55 +0200
Subject: [PATCH] Grant Site Administrators the same workflow permissions as
 Managers.

They were missing permissions on pending comments.
Fixes https://github.com/plone/plone.app.discussion/issues/199
---
 news/199.bugfix                                           | 3 +++
 plone/app/discussion/profiles/default/metadata.xml        | 2 +-
 .../workflows/comment_review_workflow/definition.xml      | 4 ++++
 plone/app/discussion/upgrades.zcml                        | 8 +++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 news/199.bugfix

diff --git a/news/199.bugfix b/news/199.bugfix
new file mode 100644
index 0000000..4d0dd3e
--- /dev/null
+++ b/news/199.bugfix
@@ -0,0 +1,3 @@
+Grant Site Administrators the same workflow permissions as Managers.
+They were missing permissions on pending comments.
+[maurits]
diff --git a/plone/app/discussion/profiles/default/metadata.xml b/plone/app/discussion/profiles/default/metadata.xml
index 57deab7..c5a929b 100644
--- a/plone/app/discussion/profiles/default/metadata.xml
+++ b/plone/app/discussion/profiles/default/metadata.xml
@@ -1,5 +1,5 @@
 <metadata>
- <version>1004</version>
+ <version>1005</version>
  <dependencies>
   <dependency>profile-plone.resource:default</dependency>
   <dependency>profile-plone.app.registry:default</dependency>
diff --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
index af19e9e..439fdb6 100644
--- a/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
+++ b/plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
@@ -20,11 +20,13 @@
                      <permission-role>Manager</permission-role>
                      <permission-role>Owner</permission-role>
                      <permission-role>Reviewer</permission-role>
+                     <permission-role>Site Administrator</permission-role>
                  </permission-map>
                  <permission-map name="Modify portal content" acquired="False">
                      <permission-role>Manager</permission-role>
                      <permission-role>Owner</permission-role>
                      <permission-role>Reviewer</permission-role>
+                     <permission-role>Site Administrator</permission-role>
                  </permission-map>
                  <permission-map name="Reply to item" acquired="False">
                  </permission-map>
@@ -32,6 +34,7 @@
                      <permission-role>Manager</permission-role>
                      <permission-role>Owner</permission-role>
                      <permission-role>Reviewer</permission-role>
+                     <permission-role>Site Administrator</permission-role>
                  </permission-map>
              </state>
              <state state_id="published" title="Published">
@@ -43,6 +46,7 @@
                  </permission-map>
                  <permission-map name="Modify portal content" acquired="False">
                      <permission-role>Manager</permission-role>
+                     <permission-role>Site Administrator</permission-role>
                  </permission-map>
                  <permission-map name="Reply to item" acquired="True">
                  </permission-map>
diff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml
index 5ab5da5..5bd6e86 100644
--- a/plone/app/discussion/upgrades.zcml
+++ b/plone/app/discussion/upgrades.zcml
@@ -87,6 +87,12 @@
       title="Add 'View comments' permission"
       import_steps="rolemap" />
 
-
+  <genericsetup:upgradeStep
+      source="1004"
+      destination="1005"
+      profile="plone.app.discussion:default"
+      title="Grant Site Administrator permissions on pending comments"
+      handler=".upgrades.upgrade_comment_workflows"
+      />
 
 </configure>