Refactoring

RedTurtle · Oct 19, 2023 · 4bbcb30 · 4bbcb30
1 parent 092f9ef
commit 4bbcb30
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/redturtle/prenotazioni/profiles/default/rolemap.xml b/src/redturtle/prenotazioni/profiles/default/rolemap.xml
@@ -59,9 +59,5 @@
       <role name="Bookings Manager" />
     </permission>
 
-    <permission name="Review portal content" acquire="True">
-      <role name="Bookings Manager" />
-    </permission>
-
   </permissions>
 </rolemap>
diff --git a/src/redturtle/prenotazioni/profiles/default/workflows/prenotazioni_workflow/definition.xml b/src/redturtle/prenotazioni/profiles/default/workflows/prenotazioni_workflow/definition.xml
@@ -29,6 +29,12 @@
    <permission-role>Reviewer</permission-role>
    <permission-role>Bookings Manager</permission-role>
   </permission-map>
+  <permission-map name="Review portal content" acquired="False">
+   <permission-role>Editor</permission-role>
+   <permission-role>Manager</permission-role>
+   <permission-role>Reviewer</permission-role>
+   <permission-role>Bookings Manager</permission-role>
+  </permission-map>
  </state>
  <state state_id="private" title="Private">
   <description>Fake initial state, immediately changed</description>
@@ -56,6 +62,12 @@
    <permission-role>Reader</permission-role>
    <permission-role>Bookings Manager</permission-role>
   </permission-map>
+  <permission-map name="Review portal content" acquired="False">
+   <permission-role>Editor</permission-role>
+   <permission-role>Manager</permission-role>
+   <permission-role>Reviewer</permission-role>
+   <permission-role>Bookings Manager</permission-role>
+  </permission-map>
  </state>
  <state state_id="confirmed" title="Confermato">
   <exit-transition transition_id="refuse"/>
@@ -80,6 +92,12 @@
    <permission-role>Reviewer</permission-role>
    <permission-role>Bookings Manager</permission-role>
   </permission-map>
+  <permission-map name="Review portal content" acquired="False">
+   <permission-role>Editor</permission-role>
+   <permission-role>Manager</permission-role>
+   <permission-role>Reviewer</permission-role>
+   <permission-role>Bookings Manager</permission-role>
+  </permission-map>
  </state>
  <state state_id="refused" title="Rifiutato">
   <exit-transition transition_id="restore"/>
@@ -104,6 +122,12 @@
    <permission-role>Reviewer</permission-role>
    <permission-role>Bookings Manager</permission-role>
   </permission-map>
+  <permission-map name="Review portal content" acquired="False">
+   <permission-role>Editor</permission-role>
+   <permission-role>Manager</permission-role>
+   <permission-role>Reviewer</permission-role>
+   <permission-role>Bookings Manager</permission-role>
+  </permission-map>
  </state>
  <transition transition_id="confirm" title="Conferma" new_state="confirmed" trigger="USER" before_script="" after_script="">
   <action url="%(content_url)s/content_status_modify?workflow_action=confirm" category="workflow" icon="">Conferma</action>

diff --git a/src/redturtle/prenotazioni/upgrades.py b/src/redturtle/prenotazioni/upgrades.py
@@ -461,6 +461,6 @@ def to_1807(context):
 def to_1808(context):
     api.portal.get_tool("portal_workflow").updateRoleMappings()
 
-    for brain in api.portal.get_tool("portal_catalog")(portal_type="Prenotazione"):
+    for brain in api.content.find(portal_type="Prenotazione"):
         brain.getObject().reindexObjectSecurity()
         logger.info("Upgraded <{UID}> security settings".format(UID=brain.UID))