Merge pull request #4030 from plone/cp-permissions

move all permissions for controlpanels to unifed file
plone · Oct 13, 2024 · f7f0b19 · f7f0b19
2 parents ad248d7 + cf0c460
commit f7f0b19
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/Products/CMFPlone/controlpanel/browser/configure.zcml b/Products/CMFPlone/controlpanel/browser/configure.zcml
@@ -4,18 +4,6 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     >
 
-  <permission
-      id="plone.app.controlpanel.Imaging"
-      title="Plone Site Setup: Imaging"
-      />
-
-  <permission
-      id="plone.app.controlpanel.TinyMCE"
-      title="Plone Site Setup: TinyMCE"
-      >
-    <role name="Manager" />
-  </permission>
-
   <!-- Control Panel Main Template -->
   <browser:page
       name="prefs_main_template"
@@ -325,16 +313,6 @@
       permission="cmf.ManagePortal"
       />
 
-  <permission
-      id="Products.CMFPlone.ManagePortalAliases"
-      title="Manage Portal Aliases"
-      />
-
-  <permission
-      id="Products.CMFPlone.ManageContextAliases"
-      title="Manage Context Aliases"
-      />
-
   <browser:page
       name="redirection-controlpanel"
       for="plone.base.interfaces.IPloneSiteRoot"

diff --git a/Products/CMFPlone/controlpanel/permissions.zcml b/Products/CMFPlone/controlpanel/permissions.zcml
@@ -67,4 +67,26 @@
     <role name="Manager" />
   </permission>
 
+  <permission
+    id="plone.app.controlpanel.Imaging"
+    title="Plone Site Setup: Imaging"
+    />
+
+  <permission
+      id="plone.app.controlpanel.TinyMCE"
+      title="Plone Site Setup: TinyMCE"
+      >
+    <role name="Manager" />
+  </permission>
+
+  <permission
+    id="Products.CMFPlone.ManagePortalAliases"
+    title="Manage Portal Aliases"
+    />
+
+  <permission
+      id="Products.CMFPlone.ManageContextAliases"
+      title="Manage Context Aliases"
+      />
+
 </configure>
diff --git a/news/4028.bugfix b/news/4028.bugfix
@@ -0,0 +1,2 @@
+move all permission definitions for controlpanels to unifed file from controlpanel directory
+[jackahl]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		move all permission definitions for controlpanels to unifed file from controlpanel directory
		[jackahl]