From c41b7fcceb16fdd98d7f41f7ef88e3c714422988 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Mon, 11 Jul 2011 14:40:54 -0400 Subject: [PATCH] list_display contrat #1542 --- project/rh/lib.py | 7 ++++++- project/rh/models.py | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/project/rh/lib.py b/project/rh/lib.py index fc351c8..eba434f 100644 --- a/project/rh/lib.py +++ b/project/rh/lib.py @@ -150,7 +150,12 @@ class CommentaireAdmin(admin.ModelAdmin): class ContratAdmin(admin.ModelAdmin): - pass + search_fields = ('dossier__employe__nom', 'dossier__employe__prenom', ) + list_display = ('id', 'dossier', '_poste', ) + + def _poste(self, obj): + return obj.dossier.poste + _poste.short_description = "Poste" class DeviseAdmin(admin.ModelAdmin): diff --git a/project/rh/models.py b/project/rh/models.py index a410f9b..e5bcfd4 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -594,12 +594,20 @@ class Remuneration(Remuneration_): ### CONTRATS + +class ContratManager(NoDeleteManager): + def get_query_set(self): + return super(ContratManager, self).get_query_set().select_related('dossier', 'dossier__poste') + class Contrat(AUFMetadata): """Document juridique qui encadre la relation de travail d'un Employe pour un Poste particulier. Pour un Dossier (qui documente cette relation de travail) plusieurs contrats peuvent être associés. """ + + objects = ContratManager() + dossier = models.ForeignKey('Dossier', db_column='dossier', related_name='+') type_contrat = models.ForeignKey('TypeContrat', db_column='type_contrat', -- 1.7.10.4