From 4fa744998e9e3446ef8b4bbeeff4f3c963984b9f Mon Sep 17 00:00:00 2001
From: Nicolas Demonte <nicolas@affinitic.be>
Date: Tue, 19 Feb 2019 16:13:44 +0100
Subject: [PATCH] Gestion-secretariat-general can set incoming mail to process
 #30755

---
 src/pfwbged/policy/browser/guards.py                        | 4 ++--
 .../workflows/incomingapfmail_workflow/definition.xml       | 2 +-
 .../default/workflows/incomingmail_workflow/definition.xml  | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pfwbged/policy/browser/guards.py b/src/pfwbged/policy/browser/guards.py
index 4d3aa62..2eb7360 100644
--- a/src/pfwbged/policy/browser/guards.py
+++ b/src/pfwbged/policy/browser/guards.py
@@ -161,9 +161,9 @@ class CanBeTrashedDmsAppendixFile(grok.View):
         return api.content.get_state(self.context) == 'published'
 
 
-class CanReturnToRegistering(grok.View):
+class CanReturnToRegisteringOrProcess(grok.View):
     """"""
-    grok.name('can_return_to_registering')
+    grok.name('can_return_to_registering_or_process')
     grok.context(IDmsIncomingMail)
     grok.require('zope2.View')
 
diff --git a/src/pfwbged/policy/profiles/default/workflows/incomingapfmail_workflow/definition.xml b/src/pfwbged/policy/profiles/default/workflows/incomingapfmail_workflow/definition.xml
index 548b7bd..c701f00 100644
--- a/src/pfwbged/policy/profiles/default/workflows/incomingapfmail_workflow/definition.xml
+++ b/src/pfwbged/policy/profiles/default/workflows/incomingapfmail_workflow/definition.xml
@@ -204,7 +204,7 @@
  <transition transition_id="back_to_registering" title="" new_state="registering" trigger="USER" before_script="" after_script="">
   <action url="%(content_url)s/content_status_modify?workflow_action=back_to_registering" category="workflow" icon="" i18n:translate="">Back to registering</action>
   <guard>
-   <guard-expression>here/@@can_return_to_registering</guard-expression>
+   <guard-expression>here/@@can_return_to_registering_or_process</guard-expression>
   </guard>
  </transition>
  <transition transition_id="directly_noaction" title="" new_state="noaction" trigger="USER" before_script="" after_script="">
diff --git a/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml b/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml
index f4b166b..3f3ba80 100644
--- a/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml
+++ b/src/pfwbged/policy/profiles/default/workflows/incomingmail_workflow/definition.xml
@@ -205,7 +205,7 @@
  <transition transition_id="back_to_registering" title="" new_state="registering" trigger="USER" before_script="" after_script="">
   <action url="%(content_url)s/content_status_modify?workflow_action=back_to_registering" category="workflow" icon="" i18n:translate="">Back to registering</action>
   <guard>
-   <guard-expression>here/@@can_return_to_registering</guard-expression>
+   <guard-expression>here/@@can_return_to_registering_or_process</guard-expression>
   </guard>
  </transition>
  <transition transition_id="directly_noaction" title="" new_state="noaction" trigger="USER" before_script="" after_script="">
@@ -241,9 +241,7 @@
  <transition transition_id="to_process" title="" new_state="processing" trigger="USER" before_script="" after_script="">
   <action url="%(content_url)s/@@to_process?workflow_action=to_process" category="workflow" icon="" i18n:translate="">To process</action>
   <guard>
-   <guard-role>Greffier</guard-role>
-   <guard-role>Manager</guard-role>
-   <guard-role>Reviewer</guard-role>
+   <guard-expression>here/@@can_return_to_registering_or_process</guard-expression>
   </guard>
  </transition>
  <variable variable_id="action" for_catalog="False" for_status="True" update_always="True">