#2033

diff --git a/project/dae/managers.py b/project/dae/managers.py
index 98460b8..14f3ccf 100644 (file)
--- a/project/dae/managers.py
+++ b/project/dae/managers.py
@@ -118,6 +118,7 @@ class PosteManager(SecurityManager):
             'id_rh',
             'responsable',
             'implantation',
+            'implantation.bureau_rattachement',
             'type_poste',
             'service',
             'classement_min',
@@ -133,6 +134,13 @@ class DossierManager(SecurityManager):
     prefixe_service = "poste__service"
     prefixe_implantation = "poste__implantation__region"
 
+    def get_query_set(self):
+        fkeys = (
+            'poste',
+        )
+        return super(DossierManager, self).get_query_set() \
+                                        .select_related(*fkeys).all()
+
     def ma_region_ou_service(self, user):
         return super(DossierManager, self).ma_region_ou_service(user).filter(poste__actif=True)
 

diff --git a/project/dae/templates/dae/embauche-row.html b/project/dae/templates/dae/embauche-row.html
index 7791d69..086333f 100644 (file)
--- a/project/dae/templates/dae/embauche-row.html
+++ b/project/dae/templates/dae/embauche-row.html
@@ -1,5 +1,6 @@
+{% load dae %}
 <tr>
-    <td>{{ dossier.poste.implantation.region }}</td>
+    <td>{{ dossier.poste.implantation|region_ou_service }}</td>
     <td>{{ dossier.poste.implantation }}</td>
     <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier.poste.nom }}</a></td>
     <td>{{ dossier.employe }}</td>

diff --git a/project/dae/templates/dae/poste-row.html b/project/dae/templates/dae/poste-row.html
index 59ed563..326653e 100644 (file)
--- a/project/dae/templates/dae/poste-row.html
+++ b/project/dae/templates/dae/poste-row.html
@@ -1,5 +1,6 @@
+{% load dae %}
 <tr>
-    <td>{{ poste.implantation.region }}</td>
+    <td>{{ poste.implantation|region_ou_service }}</td>
     <td>{{ poste.implantation }}</td>
     <td><a href="{% url poste_consulter poste.key %}">{{ poste.nom }}</a></td>
     <td>{{ poste.date_creation|date:"d-m-Y" }}</td>

diff --git a/project/dae/templatetags/dae.py b/project/dae/templatetags/dae.py
index 02a50df..4244e29 100644 (file)
--- a/project/dae/templatetags/dae.py
+++ b/project/dae/templatetags/dae.py
@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 from django import template
 from project.dae.workflow import ETATS_EDITABLE
 from project.dae.workflow import grp_correspondants_rh, grp_administrateurs, grp_drh
@@ -24,3 +26,10 @@ def est_editable(obj, user):
     else:
         return False
 
+@register.filter
+def region_ou_service(implantation):
+    if implantation.id == 15:
+        return u"Services centraux de Montréal (SCM)"
+    if implantation.id == 19:
+        return u"Services centraux de Paris (SCP)"
+    return implantation.region