From 27d7babdb32c918d52624846b6c6c6bf2eec1662 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Tue, 31 May 2011 16:38:15 -0400
Subject: [PATCH] fix #1569

---
 project/dae/decorators.py |    1 -
 project/dae/workflow.py   |   13 ++++++++++---
 project/rh_v1/models.py   |    6 +++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/project/dae/decorators.py b/project/dae/decorators.py
index 6661650..9deacac 100644
--- a/project/dae/decorators.py
+++ b/project/dae/decorators.py
@@ -72,7 +72,6 @@ def poste_dans_ma_region_ou_service(fn):
         except:
             id = key
             Poste = dae.Poste
-
         postes = Poste.objects.ma_region_ou_service(user).filter(id=id)
         if len(postes) > 0:
             return fn(request, *args, **kwargs)
diff --git a/project/dae/workflow.py b/project/dae/workflow.py
index e88965b..2a281a7 100644
--- a/project/dae/workflow.py
+++ b/project/dae/workflow.py
@@ -26,9 +26,16 @@ grp_afb = safe_create_groupe(name='AFB')
 grp_haute_direction = safe_create_groupe(name='Haute direction')
 grp_service_utilisateurs = safe_create_groupe(name='Service utilisateurs')
 
-dae_groupes = (grp_administrateurs, grp_directeurs_bureau, grp_drh,
-               grp_accior, grp_afb, grp_haute_direction, grp_service_utilisateurs,
-               grp_correspondants_rh, )
+dae_groupes = (
+    grp_correspondants_rh,
+    grp_administrateurs,
+    grp_directeurs_bureau,
+    grp_drh,
+    grp_accior,
+    grp_afb,
+    grp_haute_direction,
+    grp_service_utilisateurs,
+)
 
 # codes états
 POSTE_ETAT_REFUSE = 'REFUSE'
diff --git a/project/rh_v1/models.py b/project/rh_v1/models.py
index 840935a..bb137bc 100644
--- a/project/rh_v1/models.py
+++ b/project/rh_v1/models.py
@@ -59,6 +59,9 @@ class DossierManager(models.Manager):
     """
     Chargement de tous les objets FK existants sur chaque QuerySet.
     """
+    prefixe_service = "poste1__service"
+    prefixe_implantation = "poste1__implantation__region"
+
     def get_query_set(self):
         fkeys = (
             'employe',
@@ -312,7 +315,8 @@ class PosteManager(SecurityManager):
     """
     Chargement de tous les objets FK existants sur chaque QuerySet.
     """
-    prefixe_implantation = 'implantation'
+    prefixe_service = "service"
+    prefixe_implantation = "implantation__region"
 
     def get_query_set(self):
         fkeys = (
-- 
1.7.10.4