Merge pull request concretecms#11755 from mlocati/10-pae-categories

mlocati-forks · Nov 17, 2023 · 2868efe · 2868efe
2 parents 834d253 + 7185dc9
commit 2868efe
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 32 deletions.
diff --git a/concrete/features/base/permissions/boards.xml b/concrete/features/base/permissions/boards.xml
@@ -8,20 +8,28 @@
 
     <permissionaccessentitytypes>
         <permissionaccessentitytype handle="group">
-            <category handle="board_admin" package=""/>
-            <category handle="board" package=""/>
+            <categories>
+                <category handle="board_admin" package=""/>
+                <category handle="board" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="user">
-            <category handle="board_admin" package=""/>
-            <category handle="board" package=""/>
+            <categories>
+                <category handle="board_admin" package=""/>
+                <category handle="board" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_set">
-            <category handle="board_admin" package=""/>
-            <category handle="board" package=""/>
+            <categories>
+                <category handle="board_admin" package=""/>
+                <category handle="board" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_combination">
-            <category handle="board_admin" package=""/>
-            <category handle="board" package=""/>
+            <categories>
+                <category handle="board_admin" package=""/>
+                <category handle="board" package=""/>
+            </categories>
         </permissionaccessentitytype>
     </permissionaccessentitytypes>
 

diff --git a/concrete/features/base/permissions/calendar.xml b/concrete/features/base/permissions/calendar.xml
@@ -8,20 +8,28 @@
 
     <permissionaccessentitytypes>
         <permissionaccessentitytype handle="group">
-            <category handle="calendar_admin" package=""/>
-            <category handle="calendar" package=""/>
+            <categories>
+                <category handle="calendar_admin" package=""/>
+                <category handle="calendar" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="user">
-            <category handle="calendar_admin" package=""/>
-            <category handle="calendar" package=""/>
+            <categories>
+                <category handle="calendar_admin" package=""/>
+                <category handle="calendar" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_set">
-            <category handle="calendar_admin" package=""/>
-            <category handle="calendar" package=""/>
+            <categories>
+                <category handle="calendar_admin" package=""/>
+                <category handle="calendar" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_combination">
-            <category handle="calendar_admin" package=""/>
-            <category handle="calendar" package=""/>
+            <categories>
+                <category handle="calendar_admin" package=""/>
+                <category handle="calendar" package=""/>
+            </categories>
         </permissionaccessentitytype>
     </permissionaccessentitytypes>
 

diff --git a/concrete/features/base/permissions/conversations.xml b/concrete/features/base/permissions/conversations.xml
@@ -8,20 +8,28 @@
 
     <permissionaccessentitytypes>
         <permissionaccessentitytype handle="group">
-            <category handle="conversation" package=""/>
-            <category handle="conversation_message" package=""/>
+            <categories>
+                <category handle="conversation" package=""/>
+                <category handle="conversation_message" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="user">
-            <category handle="conversation" package=""/>
-            <category handle="conversation_message" package=""/>
+            <categories>
+                <category handle="conversation" package=""/>
+                <category handle="conversation_message" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_set">
-            <category handle="conversation" package=""/>
-            <category handle="conversation_message" package=""/>
+            <categories>
+                <category handle="conversation" package=""/>
+                <category handle="conversation_message" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_combination">
-            <category handle="conversation" package=""/>
-            <category handle="conversation_message" package=""/>
+            <categories>
+                <category handle="conversation" package=""/>
+                <category handle="conversation_message" package=""/>
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="conversation_message_author" name="Message Author" package="">
             <categories>

diff --git a/concrete/features/base/permissions/express.xml b/concrete/features/base/permissions/express.xml
@@ -8,20 +8,28 @@
 
     <permissionaccessentitytypes>
         <permissionaccessentitytype handle="group">
-            <category handle="express_tree_node" />
-            <category handle="express_entry" />
+            <categories>
+                <category handle="express_tree_node" />
+                <category handle="express_entry" />
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="user">
-            <category handle="express_tree_node" />
-            <category handle="express_entry" />
+            <categories>
+                <category handle="express_tree_node" />
+                <category handle="express_entry" />
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_set">
-            <category handle="express_tree_node" />
-            <category handle="express_entry" />
+            <categories>
+                <category handle="express_tree_node" />
+                <category handle="express_entry" />
+            </categories>
         </permissionaccessentitytype>
         <permissionaccessentitytype handle="group_combination">
-            <category handle="express_tree_node" />
-            <category handle="express_entry" />
+            <categories>
+                <category handle="express_tree_node" />
+                <category handle="express_entry" />
+            </categories>
         </permissionaccessentitytype>
     </permissionaccessentitytypes>