Fix rolemap

src/redturtle/prenotazioni/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1800</version>
+  <version>1801</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-collective.z3cform.datagridfield:default</dependency>

src/redturtle/prenotazioni/profiles/default/rolemap.xml

@@ -1,52 +1,63 @@
 <?xml version="1.0"?>
 <rolemap>
+  <roles>
+    <role name="Bookings Manager" />
+  </roles>
+
   <permissions>
 
     <permission name="redturtle.prenotazioni: Add Prenotazione" acquire="True">
       <role name="Manager"/>
       <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>
 
     <permission name="redturtle.prenotazioni: Manage Prenotazioni" acquire="True">
       <role name="Manager"/>
       <role name="Site Administrator"/>
+      <role name="Bookings Manager" />
     </permission>
-    
+
   </permissions>
 </rolemap>

src/redturtle/prenotazioni/profiles/default/sharing.xml

@@ -0,0 +1,9 @@
+<sharing xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+         i18n:domain="redturtle.prenotazioni">
+  <role
+      id="Bookings Manager"
+      title="Can Manage Bookings"
+      permission="Manage portal"
+      i18n:attributes="title"
+      />
+</sharing>

src/redturtle/prenotazioni/restapi/services/bookings/search.py

@@ -31,7 +31,9 @@ def query(self):
 
         if api.user.is_anonymous():
             raise Unauthorized("You must be logged in to perform this action")
-        elif api.user.has_permission("redturtle.prenotazioni: search prenotazioni"):
+        elif api.user.has_permission(
+            "redturtle.prenotazioni: search prenotazioni", obj=self.context
+        ):
             userid = self.request.get("userid", None)
         else:
             userid = api.user.get_current().getUserId()

src/redturtle/prenotazioni/upgrades.py

@@ -3,7 +3,9 @@
 from plone.app.contentrules.actions.workflow import WorkflowAction
 from plone.app.contentrules.conditions.portaltype import PortalTypeCondition
 from plone.app.contentrules.conditions.wfstate import WorkflowStateCondition
-from plone.app.contentrules.conditions.wftransition import WorkflowTransitionCondition
+from plone.app.contentrules.conditions.wftransition import (
+    WorkflowTransitionCondition,
+)
 from plone.app.event.base import default_timezone
 from plone.app.upgrade.utils import loadMigrationProfile
 from plone.app.workflow.remap import remap_workflow
@@ -56,6 +58,10 @@ def update_contentrules(context):
     update_profile(context, "contentrules")
 
 
+def update_sharing(context):
+    update_profile(context, "sharing")
+
+
 def reload_gs_profile(context):
     loadMigrationProfile(
         context,
@@ -148,13 +154,19 @@ def to_1400(context):
         )
 
         for portal_type_condition in portal_type_conditions:
-            if "Prenotazione" in getattr(portal_type_condition, "check_types", []):
-                for workflow_transition_condition in workflow_transition_conditions:
+            if "Prenotazione" in getattr(
+                portal_type_condition, "check_types", []
+            ):
+                for (
+                    workflow_transition_condition
+                ) in workflow_transition_conditions:
                     if isinstance(
                         workflow_transition_condition,
                         WorkflowTransitionCondition,
                     ):
-                        wf_states = list(workflow_transition_condition.wf_transitions)
+                        wf_states = list(
+                            workflow_transition_condition.wf_transitions
+                        )
 
                         if "publish" in wf_states:
                             wf_states.remove("publish")
@@ -165,7 +177,9 @@ def to_1400(context):
                             )
 
                 for workflow_state_condition in workflow_state_conditions:
-                    if isinstance(workflow_state_condition, WorkflowStateCondition):
+                    if isinstance(
+                        workflow_state_condition, WorkflowStateCondition
+                    ):
                         wf_states = list(workflow_state_condition.wf_states)
 
                         if "publish" in wf_states:
@@ -201,13 +215,17 @@ def to_1401(context):
 
 def to_1402(context):
     # load new content rules
-    context.runImportStepFromProfile(CONTENT_RULES_EVOLUTION_PROFILE, "contentrules")
+    context.runImportStepFromProfile(
+        CONTENT_RULES_EVOLUTION_PROFILE, "contentrules"
+    )
 
 
 def to_1403(context):
     update_catalog(context)
 
-    for brain in api.portal.get_tool("portal_catalog")(portal_type="Prenotazione"):
+    for brain in api.portal.get_tool("portal_catalog")(
+        portal_type="Prenotazione"
+    ):
         brain.getObject().reindexObject(idxs=["fiscalcode"])
 
 
@@ -220,7 +238,9 @@ def to_1500(context):
 def to_1502(context):
     update_catalog(context)
 
-    for brain in api.portal.get_tool("portal_catalog")(portal_type="Prenotazione"):
+    for brain in api.portal.get_tool("portal_catalog")(
+        portal_type="Prenotazione"
+    ):
         logger.info(f"[ 1500 - 1501 ] - Rindexing <{brain.getPath()}>")
         brain.getObject().reindexObject(idxs=["booking_type"])
 
@@ -342,7 +362,9 @@ def to_1600_upgrade_contentrules(context):
 
 
 def to_1601(context):
-    for brain in api.portal.get_tool("portal_catalog")(portal_type="Prenotazione"):
+    for brain in api.portal.get_tool("portal_catalog")(
+        portal_type="Prenotazione"
+    ):
         brain.getObject().reindexObject(idxs=["SearchableText"])
 
 
@@ -374,7 +396,9 @@ def to_1800(self):
     brains = api.content.find(portal_type="PrenotazioniFolder")
     for brain in brains:
         item = brain.getObject()
-        same_day_booking_disallowed = getattr(item, "same_day_booking_disallowed", None)
+        same_day_booking_disallowed = getattr(
+            item, "same_day_booking_disallowed", None
+        )
         if same_day_booking_disallowed not in ("yes", "no"):
             item.same_day_booking_disallowed = "no"
             logger.info(

src/redturtle/prenotazioni/upgrades.zcml

@@ -151,5 +151,19 @@
         handler=".upgrades.to_1800"
         />
 
+  </genericsetup:upgradeSteps>
+    <genericsetup:upgradeSteps
+      profile="redturtle.prenotazioni:default"
+      source="1800"
+      destination="1801"
+      >
+    <genericsetup:upgradeStep
+        title="Update rolemap"
+        handler=".upgrades.update_rolemap"
+        />
+    <genericsetup:upgradeStep
+        title="Update sharing"
+        handler=".upgrades.update_sharing"
+        />
   </genericsetup:upgradeSteps>
 </configure>