#1562, #1552, #1549, #1535

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

diff --git a/project/dae/decorators.py b/project/dae/decorators.py
index 6a14f2c..6661650 100644 (file)
--- a/project/dae/decorators.py
+++ b/project/dae/decorators.py
@@ -8,7 +8,7 @@ from django.http import HttpResponseRedirect
 from workflow import dae_groupes, ETATS_EDITABLE, grp_drh
 from project.dae import models as dae
 from project.rh_v1 import models as rh
-from utils import get_employe_from_user, is_user_dans_service
+from utils import get_employe_from_user
 
 def user_in_dae_groupes(user):
     """
@@ -119,10 +119,12 @@ def vieux_dossier_dans_ma_region_ou_service(fn):
         employe = get_employe_from_user(request.user)
         prefixe_implantation = 'poste1__implantation'
 
-        if is_user_dans_service(request.user):
-            q_place = Q(**{ '%s' % prefixe_implantation : employe.implantation })
-        else:
-            q_place = Q(**{ '%s__region' % prefixe_implantation : employe.implantation.region })
+        #if is_user_dans_service(request.user):
+        #    q_place = Q(**{ '%s' % prefixe_implantation : employe.implantation })
+        #else:
+        #    q_place = Q(**{ '%s__region' % prefixe_implantation : employe.implantation.region })
+
+        q_place = Q(**{ '%s__region' % prefixe_implantation : employe.implantation.region })
 
 
         if grp_drh in request.user.groups.all():