#1539 type poste

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 4ec92bd..d40bed1 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -14,7 +14,6 @@ EmployeCommentaireInline.model = EmployeCommentaire
 EmployePieceInline.model = EmployePiece
 EvenementInline.model = Evenement
 EvenementRemunerationInline.model = EvenementRemuneration
-PosteInline.model = Poste
 PosteCommentaireInline.model = PosteCommentaire
 PosteFinancementInline.model = PosteFinancement
 PostePieceInline.model = PostePiece

diff --git a/project/rh/lib.py b/project/rh/lib.py
index dbc55f2..6cd7760 100644 (file)
--- a/project/rh/lib.py
+++ b/project/rh/lib.py
@@ -66,10 +66,6 @@ class EvenementRemunerationInline(AUFMetadataInlineAdminMixin, admin.TabularInli
     extra = 1
 
 
-class PosteInline(admin.TabularInline):
-    model = models.Model  # à remplacer dans admin.py
-
-
 class PosteCommentaireInline(AUFMetadataInlineAdminMixin, admin.TabularInline):
     readonly_fields = ('owner', )
     model = models.Model  # à remplacer dans admin.py
@@ -336,8 +332,7 @@ class ResponsableImplantationAdmin(admin.ModelAdmin):
 
 
 class ServiceAdmin(admin.ModelAdmin):
-    inlines = (PosteInline,)
-
+    pass
 
 class StatutAdmin(admin.ModelAdmin):
     inlines = (EmployeInline,)
@@ -351,10 +346,14 @@ class TypeContratAdmin(admin.ModelAdmin):
     inlines = (ContratInline,)
 
 
-class TypePosteAdmin(admin.ModelAdmin):
+class TypePosteAdmin(AUFMetadataAdminMixin, admin.ModelAdmin):
     list_display = ('nom', 'famille_emploi', )
     list_filter = ('famille_emploi', )
-    inlines = (PosteInline,)
+    fieldsets = AUFMetadataAdminMixin.fieldsets + ( 
+        (None, {
+            'fields': ('nom', 'nom_feminin', 'is_responsable', 'famille_emploi',  )
+        }),
+        )
 
 
 class TypeRemunerationAdmin(admin.ModelAdmin):