Merge branch 'master' into caseinsensitive_fiscalcode_search

RedTurtle · Sep 25, 2023 · e25a832 · e25a832
2 parents 2313771 + c72c670
commit e25a832
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -12,6 +12,9 @@ Changelog
   fare ricerche case insensitive
   [mamico]
 
+- Remove Contributor from the package permissions map
+  [folix-01]
+
 
 2.0.0 (2023-09-12)
 ------------------

diff --git a/src/redturtle/prenotazioni/profiles/default/metadata.xml b/src/redturtle/prenotazioni/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1802</version>
+  <version>1803</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-collective.z3cform.datagridfield:default</dependency>

diff --git a/src/redturtle/prenotazioni/profiles/default/rolemap.xml b/src/redturtle/prenotazioni/profiles/default/rolemap.xml
@@ -11,45 +11,39 @@
       <role name="Site Administrator"/>
       <role name="Owner"/>
       <role name="Bookings Manager" />
-      <role name="Contributor"/>
     </permission>
 
     <permission name="redturtle.prenotazioni: Add PrenotazioniDay" acquire="True">
       <role name="Manager"/>
       <role name="Site Administrator"/>
       <role name="Owner"/>
-      <role name="Contributor"/>
       <role name="Bookings Manager" />
     </permission>
 
     <permission name="redturtle.prenotazioni: Add PrenotazioniWeek" acquire="True">
       <role name="Manager"/>
       <role name="Site Administrator"/>
       <role name="Owner"/>
-      <role name="Contributor"/>
       <role name="Bookings Manager" />
     </permission>
 
     <permission name="redturtle.prenotazioni: Add PrenotazioniYear" acquire="True">
       <role name="Manager"/>
       <role name="Site Administrator"/>
       <role name="Owner"/>
-      <role name="Contributor"/>
       <role name="Bookings Manager" />
     </permission>
 
     <permission name="redturtle.prenotazioni: Add PrenotazioniFolder" acquire="True">
       <role name="Manager"/>
       <role name="Site Administrator"/>
       <role name="Owner"/>
-      <role name="Contributor"/>
       <role name="Bookings Manager" />
     </permission>
 
     <permission name="redturtle.prenotazioni: search prenotazioni" acquire="True">
       <role name="Manager"/>
       <role name="Site Administrator"/>
-      <role name="Contributor"/>
       <role name="Bookings Manager" />
     </permission>
 

diff --git a/src/redturtle/prenotazioni/upgrades.zcml b/src/redturtle/prenotazioni/upgrades.zcml
@@ -176,5 +176,14 @@
         handler=".upgrades.update_booking_code"
         />
   </genericsetup:upgradeSteps>
-
+  <genericsetup:upgradeSteps
+      profile="redturtle.prenotazioni:default"
+      source="1802"
+      destination="1803"
+      >
+    <genericsetup:upgradeStep
+        title="Remove Contributor from package permissions"
+        handler=".upgrades.update_rolemap"
+        />
+  </genericsetup:upgradeSteps>
 </configure>