utils -> groups

diff --git a/project/dae/catalogues.py b/project/dae/catalogues.py
index 84d8fe6..e738add 100644 (file)
--- a/project/dae/catalogues.py
+++ b/project/dae/catalogues.py
@@ -2,7 +2,7 @@
 
 from django.db.models import Q
 
-from project.utils import \
+from project.groups import \
         get_employe_from_user, is_user_dans_services_centraux
 from project.rh import models as rh
 

diff --git a/project/dae/forms.py b/project/dae/forms.py
index 79f07dc..d9b7299 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -13,7 +13,7 @@ from auf.django.references import models as ref
 from auf.django.workflow.forms import WorkflowFormMixin
 
 from project.rh import models as rh
-from project.utils import \
+from project.groups import \
         get_employe_from_user, is_user_dans_services_centraux
 
 from project.dae import models as dae

diff --git a/project/dae/managers.py b/project/dae/managers.py
index b5affe9..dbcb0a6 100644 (file)
--- a/project/dae/managers.py
+++ b/project/dae/managers.py
@@ -2,7 +2,7 @@
 
 from django.db.models import Q
 
-from project.utils import get_employe_from_user
+from project.groups import get_employe_from_user
 from project.rh.managers import \
         DossierManager as RHDossierManager, \
         PosteManager as RHPosteManager, \

diff --git a/project/dae/workflow.py b/project/dae/workflow.py
index 8233fac..0296206 100644 (file)
--- a/project/dae/workflow.py
+++ b/project/dae/workflow.py
@@ -6,7 +6,7 @@ from project.groups import \
         grp_drh, grp_drh2, grp_administrateurs, grp_service_utilisateurs, \
         grp_correspondants_rh, grp_directeurs_bureau, grp_accior, grp_abf, \
         grp_haute_direction
-from project.utils import \
+from project.groups import \
         is_user_dans_services_centraux, is_user_dans_region
 
 dae_groupes = (

diff --git a/project/decorators.py b/project/decorators.py
index 9f08694..a5e3805 100644 (file)
--- a/project/decorators.py
+++ b/project/decorators.py
@@ -11,7 +11,7 @@ from django.core.urlresolvers import reverse
 from django.utils.http import urlquote
 
 from project.groups import grp_drh, grp_drh2, grp_correspondants_rh
-from project.utils import get_employe_from_user
+from project.groups import get_employe_from_user
 
 
 def redirect_interdiction(request, msg=u"Vous n'avez pas accès à cette page"):

diff --git a/project/groups.py b/project/groups.py
index 1925362..382a808 100644 (file)
--- a/project/groups.py
+++ b/project/groups.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 from django.contrib.auth.models import Group
+import auf.django.references.models as ref
 
 def safe_create_groupe(name):
     """
@@ -34,3 +35,24 @@ grp_accior = safe_create_groupe(name=ACCIOR)
 grp_abf = safe_create_groupe(name=ABF)
 grp_haute_direction = safe_create_groupe(name=HAUTE_DIRECTION)
 grp_service_utilisateurs = safe_create_groupe(name=SERVICE_UTILISATEURS)
+
+def get_employe_from_user(user):
+  """
+  Retourne un employé AUF à partir de son user Django. 
+  """
+  try:
+      employe = ref.Authentification.objects.get(courriel=user.email).id
+      # ajouter coordonnées via ref.Employe? (courriel, tel, etc.)
+  except:
+      raise Exception(u"L'employé avec le courriel %s n'a pas été trouvé dans le référentiel." % user.email)
+  return employe
+
+def is_user_dans_services_centraux(user):
+    employe = get_employe_from_user(user)
+    if employe.id == 12: # monique chéry gère les DAE des amériques
+        return False
+    return employe.implantation_id in (15, 19)
+
+def is_user_dans_region(user):
+    employe = get_employe_from_user(user)
+    return not is_user_dans_services_centraux(user)

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index a426eed..a3d31ab 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -14,7 +14,7 @@ from reversion.admin import VersionAdmin
 from auf.django.emploi.models import OffreEmploi, Candidat, CandidatPiece
 from auf.django.references.models import Region, Bureau
 
-from project.utils import get_employe_from_user as get_emp
+from project.groups import get_employe_from_user as get_emp
 from project.rh import models as rh
 
 from project.recrutement.forms import OffreEmploiForm

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 94418d3..d9899a1 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -17,7 +17,7 @@ import auf.django.references.models as ref
 
 from project.decorators import in_drh_or_admin
 from project.groups import grp_correspondants_rh
-from project.utils import get_employe_from_user
+from project.groups import get_employe_from_user
 
 import project.rh.models as rh
 from project.rh.forms import \

diff --git a/project/rh/managers.py b/project/rh/managers.py
index 7553311..73f91e5 100644 (file)
--- a/project/rh/managers.py
+++ b/project/rh/managers.py
@@ -7,7 +7,7 @@ from django.db.models import Q
 
 from auf.django.metadata.managers import NoDeleteManager
 
-from project.utils import get_employe_from_user
+from project.groups import get_employe_from_user
 from project.groups import grp_administrateurs, \
                      grp_directeurs_bureau, \
                      grp_drh, \

diff --git a/project/rh/views.py b/project/rh/views.py
index 5837f9f..6d1f1af 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -22,7 +22,7 @@ from auf.django.references import models as ref
 from project.decorators import redirect_interdiction
 from project.decorators import drh_or_admin_required
 from project.decorators import region_protected
-from project.utils import get_employe_from_user
+from project.groups import get_employe_from_user
 
 from project.rh import models as rh
 from project.rh import graph as rh_graph

diff --git a/project/utils.py b/project/utils.py
index 705ba57..a62d2f9 100644 (file)
--- a/project/utils.py
+++ b/project/utils.py
@@ -2,25 +2,6 @@
 
 import auf.django.references.models as ref
 
-def get_employe_from_user(user):
-  """
-  Retourne un employé AUF à partir de son user Django. 
-  """
-  try:
-      employe = ref.Authentification.objects.get(courriel=user.email).id
-      # ajouter coordonnées via ref.Employe? (courriel, tel, etc.)
-  except:
-      raise Exception(u"L'employé avec le courriel %s n'a pas été trouvé dans le référentiel." % user.email)
-  return employe
 
-def is_user_dans_services_centraux(user):
-    employe = get_employe_from_user(user)
-    if employe.id == 12: # monique chéry gère les DAE des amériques
-        return False
-    return employe.implantation_id in (15, 19)
-
-def is_user_dans_region(user):
-    employe = get_employe_from_user(user)
-    return not is_user_dans_services_centraux(user)