From b5cc035763552c7fdd60911aeca5ca0691507aae Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Tue, 31 Jan 2012 17:07:30 -0500
Subject: [PATCH] =?utf8?q?dossier=20pass=C3=A9=20pas=20de=20lien=20pas=20dap?=
 =?utf8?q?ercu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 project/rh/admin.py  |   16 +++++++++-------
 project/rh/models.py |    2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 37e8c5d..f96edbd 100644
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -411,20 +411,22 @@ class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin):
     def _dossiers(self, obj):
         l = []
         for d in obj.rh_dossiers.all().order_by('-date_debut'):
-            style = ""
             apercu = u"""<a title="Aperçu du dossier" href="%s" onclick="return showAddAnotherPopup(this);" title="Aperçu du dossier"><img src="%simg/loupe.png" /></a>""" % \
                 (reverse('dossier_apercu', args=(d.id,)), settings.MEDIA_URL,)
-
-            if d.date_fin is not None:
-                apercu = ""
-                style = u"color: grey";
-            link = u"""<li>%s<a style="%s;" href='%s'>%s : %s</a></li>""" % \
+            link = u"""<li>%s<a href='%s'>%s : %s</a></li>""" % \
                 (apercu,
-                 style,
                  reverse('admin:rh_dossier_change', args=(d.id,)),
                  d.date_debut.year,
                  d.poste,
                  )
+
+            # Dossier terminé en gris non cliquable
+            if d.date_fin is not None:
+                link = u"""<li style="color: grey">%s : %s</li>""" % \
+                    (d.date_debut.year,
+                     d.poste,
+                    )
+
             l.append(link)
         return "<ul>%s</ul>" % "\n".join(l)
     _dossiers.allow_tags = True
diff --git a/project/rh/models.py b/project/rh/models.py
index 8f5961b..73fd2c3 100644
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -431,7 +431,7 @@ class Employe(AUFMetadata):
             pass
         return poste
 
-    prefix_implantation = "dossiers__poste__implantation__region"
+    prefix_implantation = "rh_dossiers__poste__implantation__region"
     def get_regions(self):
         regions = []
         for d in self.dossiers.all():
-- 
1.7.10.4