diff --git a/bt5/erp5_calendar/ModuleTemplateItem/group_calendar_module.xml b/bt5/erp5_calendar/ModuleTemplateItem/group_calendar_module.xml
index 3d43779bcbcf4cb10bb26dccb22c62eec343d64d..a60a55441614e7ba31ebd53e1bb1af7c1c570571 100644
--- a/bt5/erp5_calendar/ModuleTemplateItem/group_calendar_module.xml
+++ b/bt5/erp5_calendar/ModuleTemplateItem/group_calendar_module.xml
@@ -40,8 +40,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>AccessContentsInformation</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
@@ -452,8 +453,9 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Change user folder</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
@@ -574,8 +576,9 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Manage extensions</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Manage languages</name>
@@ -688,7 +691,6 @@
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
- <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
diff --git a/bt5/erp5_calendar/ModuleTemplateItem/leave_request_module.xml b/bt5/erp5_calendar/ModuleTemplateItem/leave_request_module.xml
index 8641283e2085642d140064e4e4231701e9187e34..900f230f21ed4350da387b0067b1068e8d4a896c 100644
--- a/bt5/erp5_calendar/ModuleTemplateItem/leave_request_module.xml
+++ b/bt5/erp5_calendar/ModuleTemplateItem/leave_request_module.xml
@@ -40,8 +40,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>AccessContentsInformation</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
@@ -452,8 +453,9 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Change user folder</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
@@ -574,8 +576,9 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Manage extensions</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Manage languages</name>
@@ -688,7 +691,6 @@
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
- <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
diff --git a/bt5/erp5_calendar/ModuleTemplateItem/presence_request_module.xml b/bt5/erp5_calendar/ModuleTemplateItem/presence_request_module.xml
index 24f61b6795a704a0d8f8c10be02fdd940df1e062..6ef58d3360feeba6bbe03422612de41b15ae4a25 100644
--- a/bt5/erp5_calendar/ModuleTemplateItem/presence_request_module.xml
+++ b/bt5/erp5_calendar/ModuleTemplateItem/presence_request_module.xml
@@ -40,8 +40,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>AccessContentsInformation</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
@@ -452,8 +453,9 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Change user folder</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
@@ -574,8 +576,9 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Manage extensions</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Manage languages</name>
@@ -688,7 +691,6 @@
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
- <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
diff --git a/bt5/erp5_calendar/bt/revision b/bt5/erp5_calendar/bt/revision
index 815f89dbff57f71546ebd5fd99ef7c31fb8c2901..3c7d064c14f18c2752bc1be3268fc7974f0ec5da 100644
--- a/bt5/erp5_calendar/bt/revision
+++ b/bt5/erp5_calendar/bt/revision
@@ -1 +1 @@
-311
\ No newline at end of file
+312
\ No newline at end of file
diff --git a/bt5/erp5_dms/ModuleTemplateItem/document_ingestion_module.xml b/bt5/erp5_dms/ModuleTemplateItem/document_ingestion_module.xml
index 4511159781f301d01ad80c375c52dad9e48064a5..eb83c3b2a648b4ed095d8ad524b104026c8ed361 100644
--- a/bt5/erp5_dms/ModuleTemplateItem/document_ingestion_module.xml
+++ b/bt5/erp5_dms/ModuleTemplateItem/document_ingestion_module.xml
@@ -40,6 +40,10 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>AccessContentsInformation</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
<role>Manager</role>
@@ -168,10 +172,6 @@
<name>Add ERP5Catalog Tools</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add ERP5Configurator Tools</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add ERP5Form Tools</name>
<role>Manager</role>
@@ -188,10 +188,6 @@
<name>Add ERP5Type Tools</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add ERP5Wizard Tools</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add ExtFiles</name>
<role>Manager</role>
@@ -244,14 +240,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -304,14 +292,6 @@
<name>Add Vocabularies</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add XML Method Cache Managers</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add XSLT Methods</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Z Gadfly Database Connections</name>
<role>Manager</role>
@@ -416,10 +396,6 @@
<name>Change Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change Photo</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change Python Scripts</name>
<role>Manager</role>
@@ -477,6 +453,10 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Change user folder</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Assignee</role>
@@ -507,10 +487,6 @@
<name>Download ExtFile/ExtImage</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Edit</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Edit Factories</name>
<role>Manager</role>
@@ -573,23 +549,19 @@
<role>Manager</role>
</permission>
<permission type='tuple'>
- <name>Manage Transient Object Container</name>
+ <name>Manage Selenium test cases</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
- <name>Manage Vocabulary</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Manage WebDAV Locks</name>
+ <name>Manage Transient Object Container</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
- <name>Manage XML Method Cache</name>
+ <name>Manage Vocabulary</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
- <name>Manage XML Methods</name>
+ <name>Manage WebDAV Locks</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -604,6 +576,10 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Manage extensions</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Manage languages</name>
<role>Manager</role>
@@ -715,7 +691,6 @@
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
- <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
diff --git a/bt5/erp5_dms/ModuleTemplateItem/document_module.xml b/bt5/erp5_dms/ModuleTemplateItem/document_module.xml
index 84a080c48072f7567117cd06baf8b77870bea59d..3d4359076f72221ca1d49d606374c649ce4f5e9c 100644
--- a/bt5/erp5_dms/ModuleTemplateItem/document_module.xml
+++ b/bt5/erp5_dms/ModuleTemplateItem/document_module.xml
@@ -40,6 +40,10 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>AccessContentsInformation</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
<role>Manager</role>
@@ -64,8 +68,9 @@
<name>Add CMF Caching Policy Managers</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add CMF Calendar Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add CMF Core Tools</name>
@@ -79,15 +84,17 @@
<name>Add CMF Report Tools</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add CMF Setup Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add CMF Sites</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add CMF Unique Id Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add CMFActivity Tools</name>
@@ -101,8 +108,9 @@
<name>Add CMFMailIn Tools</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add Configured CMF Sites</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Content Type Registrys</name>
@@ -232,14 +240,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -284,10 +284,6 @@
<name>Add User Folders</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Versions</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Virtual Host Monsters</name>
<role>Manager</role>
@@ -334,8 +330,9 @@
<role>Author</role>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add portal events</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add portal folders</name>
@@ -399,10 +396,6 @@
<name>Change Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change Photo</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change Python Scripts</name>
<role>Manager</role>
@@ -448,8 +441,9 @@
<name>Change permissions</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Change portal events</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change portal topics</name>
@@ -459,12 +453,18 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Change user folder</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Copy or Move</name>
+ <role>Assignee</role>
<role>Assignor</role>
+ <role>Associate</role>
<role>Auditor</role>
+ <role>Author</role>
<role>Manager</role>
- <role>Owner</role>
</permission>
<permission type='tuple'>
<name>Create Transient Objects</name>
@@ -548,6 +548,10 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Manage Selenium test cases</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
@@ -572,6 +576,10 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Manage extensions</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Manage languages</name>
<role>Manager</role>
@@ -683,7 +691,6 @@
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
- <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
diff --git a/bt5/erp5_dms/ModuleTemplateItem/external_source_module.xml b/bt5/erp5_dms/ModuleTemplateItem/external_source_module.xml
index 08714c89c7ab46ea19f830bef8faba10daacde69..5c518c4afb9a03ab294f82efa341c76eb675f4c9 100644
--- a/bt5/erp5_dms/ModuleTemplateItem/external_source_module.xml
+++ b/bt5/erp5_dms/ModuleTemplateItem/external_source_module.xml
@@ -40,6 +40,10 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>AccessContentsInformation</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
<role>Manager</role>
@@ -228,19 +232,12 @@
<name>Add MessageCatalogs</name>
<role>Manager</role>
</permission>
- <permission type='list'>
- <name>Add MimetypesRegistry Tools</name>
- </permission>
- <permission type='tuple'>
- <name>Add Page Templates</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
- <name>Add Photo Folders</name>
+ <name>Add MimetypesRegistry Tools</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
- <name>Add Photos</name>
+ <name>Add Page Templates</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -251,8 +248,9 @@
<name>Add Plugin Registrys</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add PortalTransforms Tools</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add Python Scripts</name>
@@ -286,10 +284,6 @@
<name>Add User Folders</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Versions</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Virtual Host Monsters</name>
<role>Manager</role>
@@ -306,8 +300,9 @@
<name>Add Z MySQL Database Connections</name>
<role>Manager</role>
</permission>
- <permission type='list'>
+ <permission type='tuple'>
<name>Add Z MySQL Deferred Database Connections</name>
+ <role>Manager</role>
</permission>
<permission type='tuple'>
<name>Add ZCatalogs</name>
@@ -401,10 +396,6 @@
<name>Change Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change Photo</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change Python Scripts</name>
<role>Manager</role>
@@ -462,8 +453,17 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Change user folder</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Copy or Move</name>
+ <role>Assignee</role>
+ <role>Assignor</role>
+ <role>Associate</role>
+ <role>Auditor</role>
+ <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
@@ -548,6 +548,10 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Manage Selenium test cases</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
@@ -572,6 +576,10 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Manage extensions</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Manage languages</name>
<role>Manager</role>
@@ -683,7 +691,6 @@
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
- <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
diff --git a/bt5/erp5_dms/ModuleTemplateItem/image_module.xml b/bt5/erp5_dms/ModuleTemplateItem/image_module.xml
index b25ee4a21ac2cc9ec9464fd598edcc20747746ee..9511b4a8bebb0e1ee839410b45fdaabc0dfbcf2b 100644
--- a/bt5/erp5_dms/ModuleTemplateItem/image_module.xml
+++ b/bt5/erp5_dms/ModuleTemplateItem/image_module.xml
@@ -40,6 +40,10 @@
<role>Author</role>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>AccessContentsInformation</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Add Accelerated HTTP Cache Managers</name>
<role>Manager</role>
@@ -236,14 +240,6 @@
<name>Add Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Photo Folders</name>
- <role>Manager</role>
- </permission>
- <permission type='tuple'>
- <name>Add Photos</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Pluggable Index</name>
<role>Manager</role>
@@ -288,10 +284,6 @@
<name>Add User Folders</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Add Versions</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Add Virtual Host Monsters</name>
<role>Manager</role>
@@ -404,10 +396,6 @@
<name>Change Page Templates</name>
<role>Manager</role>
</permission>
- <permission type='tuple'>
- <name>Change Photo</name>
- <role>Manager</role>
- </permission>
<permission type='tuple'>
<name>Change Python Scripts</name>
<role>Manager</role>
@@ -465,6 +453,10 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Change user folder</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Assignee</role>
@@ -556,6 +548,10 @@
<name>Manage Groups</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Manage Selenium test cases</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Manage Transient Object Container</name>
<role>Manager</role>
@@ -580,6 +576,10 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
+ <permission type='tuple'>
+ <name>Manage extensions</name>
+ <role>Manager</role>
+ </permission>
<permission type='tuple'>
<name>Manage languages</name>
<role>Manager</role>
@@ -691,7 +691,6 @@
<role>Assignor</role>
<role>Associate</role>
<role>Auditor</role>
- <role>Author</role>
<role>Manager</role>
</permission>
<permission type='tuple'>
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index 2cda7945ff0a2e91f9c61f6c22529ba262a076e5..707e2574997140b593d917b65e5ec20e6e9dea01 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-852
\ No newline at end of file
+853
\ No newline at end of file