fix responsable / implantation

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 07e1efb..adb1099 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -1060,19 +1060,18 @@ class ResponsableImplantationAdmin(BaseAdmin):
 
     def _responsable(self, obj):
         try:
-            employe = obj.responsable.employe
+            employe = employe = obj.responsable.employe
+        except Exception, e:
+            return u"<span style='color: red;'>Pas de responsable</span><!-- %s -->" % e
+        try:
             dossiers = employe.dossiers_encours()
             if len(dossiers) == 0:
                 return u"<span style='color: red;'>%s %s </span>" % (
                     employe, u"sans dossier actif")
             else:
                 return employe
-        except Exception:
-            if obj.statut in (1, 2):  # ouverte, ouverture imminente
-                css = "style='color: red;'"
-            else:
-                css = ""
-            return u"<span %s>Pas de responsable</span>" % css
+        except Exception, e:
+            return u"<!-- %s -->" % e
     _responsable.allow_tags = True
     _responsable.short_description = u"Responsable"
     _responsable.admin_order_field = 'responsable__employe__nom'

diff --git a/project/rh/models.py b/project/rh/models.py
index 944df17..43ae7bf 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -578,21 +578,21 @@ class Employe(models.Model):
 
     def dossiers_passes(self):
         params = {KEY_STATUT: STATUT_INACTIF, }
-        search = RechercheTemporelle(params, self.__class__)
+        search = RechercheTemporelle(params, Dossier)
         search.purge_params(params)
         q = search.get_q_temporel(self.rh_dossiers)
         return self.rh_dossiers.filter(q)
 
     def dossiers_futurs(self):
         params = {KEY_STATUT: STATUT_FUTUR, }
-        search = RechercheTemporelle(params, self.__class__)
+        search = RechercheTemporelle(params, Dossier)
         search.purge_params(params)
         q = search.get_q_temporel(self.rh_dossiers)
         return self.rh_dossiers.filter(q)
 
     def dossiers_encours(self):
         params = {KEY_STATUT: STATUT_ACTIF, }
-        search = RechercheTemporelle(params, self.__class__)
+        search = RechercheTemporelle(params, Dossier)
         search.purge_params(params)
         q = search.get_q_temporel(self.rh_dossiers)
         return self.rh_dossiers.filter(q)