projets
/
auf_rh_dae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix responsable / implantation
[auf_rh_dae.git]
/
project
/
rh
/
admin.py
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:
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
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'
_responsable.allow_tags = True
_responsable.short_description = u"Responsable"
_responsable.admin_order_field = 'responsable__employe__nom'