From d6bfa9eebd390c356cb2d84ba5801f347f32f4d1 Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Thu, 17 Feb 2022 16:37:38 +0200
Subject: [PATCH 1/4] #180 Added 'View comments' permission

---
 plone/app/discussion/browser/configure.zcml       | 2 +-
 plone/app/discussion/permissions.zcml             | 5 +++++
 plone/app/discussion/profiles/default/rolemap.xml | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml
index 9572de5..15c015f 100644
--- a/plone/app/discussion/browser/configure.zcml
+++ b/plone/app/discussion/browser/configure.zcml
@@ -117,7 +117,7 @@
         manager="plone.app.layout.viewlets.interfaces.IBelowContent"
         view="plone.app.layout.globals.interfaces.IViewView"
         class=".comments.CommentsViewlet"
-        permission="zope2.View"
+        permission="plone.app.discussion.ViewComments"
         />
 
     <!-- Conversation view -->
diff --git a/plone/app/discussion/permissions.zcml b/plone/app/discussion/permissions.zcml
index 39ff305..8c05904 100644
--- a/plone/app/discussion/permissions.zcml
+++ b/plone/app/discussion/permissions.zcml
@@ -4,6 +4,11 @@
 
     <!-- custom permissions are defined here -->
 
+    <permission
+        id="plone.app.discussion.ViewComments"
+        title="View comments"
+        />
+
     <permission
         id="plone.app.discussion.ReviewComments"
         title="Review comments"
diff --git a/plone/app/discussion/profiles/default/rolemap.xml b/plone/app/discussion/profiles/default/rolemap.xml
index e63aae6..44fa843 100644
--- a/plone/app/discussion/profiles/default/rolemap.xml
+++ b/plone/app/discussion/profiles/default/rolemap.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <rolemap>
     <permissions>
+        <permission name="View comments" acquire="True">
+            <role name="Anonymous"/>
+        </permission>
         <permission name="Review comments" acquire="True">
             <role name="Manager"/>
             <role name="Site Administrator"/>

From d3c804e3ba6783ee00d06f143bbc1ba2d723258f Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Thu, 17 Feb 2022 16:45:09 +0200
Subject: [PATCH 2/4] Changelog

---
 news/180.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/180.feature

diff --git a/news/180.feature b/news/180.feature
new file mode 100644
index 0000000..867361a
--- /dev/null
+++ b/news/180.feature
@@ -0,0 +1 @@
+- Added 'View comments' permission. [@razvanMiu]
\ No newline at end of file

From 5beb67332132b57d13d1102f69a30e35bb56f0b3 Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Tue, 1 Mar 2022 13:07:27 +0200
Subject: [PATCH 3/4] Add upgrade step

---
 plone/app/discussion/profiles/default/metadata.xml | 2 +-
 plone/app/discussion/upgrades.zcml                 | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plone/app/discussion/profiles/default/metadata.xml b/plone/app/discussion/profiles/default/metadata.xml
index 727c28c..57deab7 100644
--- a/plone/app/discussion/profiles/default/metadata.xml
+++ b/plone/app/discussion/profiles/default/metadata.xml
@@ -1,5 +1,5 @@
 <metadata>
- <version>1003</version>
+ <version>1004</version>
  <dependencies>
   <dependency>profile-plone.resource:default</dependency>
   <dependency>profile-plone.app.registry:default</dependency>
diff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml
index 4417858..5cf6e43 100644
--- a/plone/app/discussion/upgrades.zcml
+++ b/plone/app/discussion/upgrades.zcml
@@ -80,6 +80,13 @@
       title="Update controlpanel icon"
       import_steps="controlpanel" />
 
+    <genericsetup:upgradeDepends
+      source="1003"
+      destination="1004"
+      profile="plone.app.discussion:default"
+      title="Add 'View comments' permission"
+      import_steps="controlpanel" />
+
 
 
 </configure>

From 733efe3287d4aacd7d722cd87476b5651297dfef Mon Sep 17 00:00:00 2001
From: Miu Razvan <miu.razvan28@gmail.com>
Date: Tue, 1 Mar 2022 13:09:03 +0200
Subject: [PATCH 4/4] Changed import_step to rolemap

---
 plone/app/discussion/upgrades.zcml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml
index 5cf6e43..5ab5da5 100644
--- a/plone/app/discussion/upgrades.zcml
+++ b/plone/app/discussion/upgrades.zcml
@@ -85,7 +85,7 @@
       destination="1004"
       profile="plone.app.discussion:default"
       title="Add 'View comments' permission"
-      import_steps="controlpanel" />
+      import_steps="rolemap" />