Merge branch 'master' into test

[auf_rh_dae.git] / project / dae / workflow.py

diff --git a/project/dae/workflow.py b/project/dae/workflow.py
index dc3a408..cd604f9 100644 (file)
--- a/project/dae/workflow.py
+++ b/project/dae/workflow.py
@@ -234,8 +234,8 @@ class PosteWorkflow(WorkflowMixin):
         if not is_user_dans_services_centraux(request.user):
             return False
         user_groups = request.user.groups.all()
-        return grp_administrateurs in user_groups or grp_drh in user_groups or \
-                grp_drh2 in user_groups
+        return grp_administrateurs in user_groups or grp_grp_drh in user_groups or \
+               grp_drh2 in user_groups
 
     def acces_accior(self, action, request):
         user_groups = request.user.groups.all()
@@ -256,7 +256,10 @@ class PosteWorkflow(WorkflowMixin):
 
     def acces_drh_finalisation(self, action, request):
         user_groups = request.user.groups.all()
-        return grp_drh in user_groups or grp_drh2 in user_groups
+        return grp_administrateurs in user_groups or \
+               grp_correspondants_rh in user_groups or \
+                grp_drh in user_groups or \
+                grp_drh2 in user_groups
 
     def acces_demande_justif(self, action, request):
         user_groups = request.user.groups.all()
@@ -300,7 +303,9 @@ class DossierWorkflow(PosteWorkflow):
 
 
 MAP_GROUPE_ETATS_A_FAIRE = {
-    grp_correspondants_rh : (POSTE_ETAT_BROUILLON, DOSSIER_ETAT_BROUILLON, ),
+    grp_correspondants_rh : (POSTE_ETAT_BROUILLON, DOSSIER_ETAT_BROUILLON,
+                             POSTE_ETAT_REGION_FINALISATION,
+                             DOSSIER_ETAT_REGION_FINALISATION),
     grp_service_utilisateurs : (POSTE_ETAT_SERVICE_UTILISATEURS,
                                 DOSSIER_ETAT_SERVICE_UTILISATEURS,),
     grp_administrateurs : (POSTE_ETAT_ADMINISTRATEUR,