From 70561dc249bfd3a13997ced43dfdb5ae8ca3f358 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Thu, 7 Jul 2011 11:24:38 -0400 Subject: [PATCH] #1540 #1542 poste --- project/rh/lib.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/project/rh/lib.py b/project/rh/lib.py index 184c3e5..61c32e6 100644 --- a/project/rh/lib.py +++ b/project/rh/lib.py @@ -111,7 +111,10 @@ class PosteInline(admin.TabularInline): class PosteCommentaireInline(admin.TabularInline): + exclude = METADATA_READONLY_FIELDS + ('actif', ) + readonly_fields = ('owner', ) model = models.Model # à remplacer dans admin.py + extra = 1 class PosteFinancementInline(admin.TabularInline): @@ -306,6 +309,8 @@ class OrganismeBstgAdmin(admin.ModelAdmin): class PosteAdmin(admin.ModelAdmin): + search_fields = ('nom', 'implantation__code', 'implantation__nom', 'implantation__region__code', 'implantation__region__nom', ) + list_display = ('nom', 'implantation', 'service', 'type_poste', 'date_debut', 'date_fin', ) fieldsets = ( (None, { 'fields': ('nom', 'nom_feminin', 'implantation', 'type_poste', @@ -340,9 +345,16 @@ class PosteAdmin(admin.ModelAdmin): inlines = (PosteFinancementInline, PostePieceInline, - PosteCommentaireInline, - DossierROInline) + DossierROInline, + PosteCommentaireInline, ) + def save_formset(self, request, form, formset, change): + instances = formset.save(commit=False) + for instance in instances: + if instance.__class__ == rh.PosteCommentaire: + instance.owner = request.user + instance.save() + formset.save_m2m() class PosteCommentaireAdmin(admin.ModelAdmin): pass -- 1.7.10.4