#5449

[auf_rh_dae.git] / project / rh / admin.py

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 5815a32..f70f405 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -352,12 +352,17 @@ class PosteComparaisonInline(admin.TabularInline):
     model = rh.PosteComparaison
 
 
-class ClassementAdmin(reversion.VersionAdmin, DerniereModificationAdmin,
+class ClassementAdmin(reversion.VersionAdmin,
+                      ArchivableAdmin,
+                      DerniereModificationAdmin,
                       BaseAdmin):
     ignore_duplicate_revisions = True
-    list_display = ('_classement', 'derniere_modification')
+    list_display = ('_classement', 'derniere_modification', '_archive')
+    list_filter = ('archive', )
     fieldsets = (
-        (None, {'fields': ('type', 'echelon', 'degre', 'coefficient',)}),
+        (None, {'fields': (
+                    'type', 'echelon',
+                    'degre', 'coefficient', 'archive')}),
     )
 
     def _classement(self, obj):
@@ -1162,13 +1167,16 @@ class ServiceProxyAdmin(ServiceAdminBase):
     _organigramme.short_description = "Organigramme"
 
 
-class StatutAdmin(reversion.VersionAdmin, DerniereModificationAdmin,
+class StatutAdmin(reversion.VersionAdmin,
+                  ArchivableAdmin,
+                  DerniereModificationAdmin,
                   BaseAdmin):
     ignore_duplicate_revisions = True
-    list_display = ('code', 'nom', 'derniere_modification')
+    list_display = ('code', 'nom', 'derniere_modification', '_archive')
+    list_filter = ('archive', )
     fieldsets = (
         (None, {
-            'fields': ('code', 'nom', ),
+            'fields': ('code', 'nom', 'archive'),
         }),
     )
 
@@ -1185,28 +1193,35 @@ class TauxChangeAdmin(reversion.VersionAdmin, DerniereModificationAdmin,
     )
 
 
-class TypeContratAdmin(reversion.VersionAdmin, DerniereModificationAdmin,
+class TypeContratAdmin(reversion.VersionAdmin,
+                       ArchivableAdmin,
+                       DerniereModificationAdmin,
                        BaseAdmin):
     ignore_duplicate_revisions = True
-    list_display = ('nom', 'nom_long', 'derniere_modification')
+    list_display = ('nom', 'nom_long', 'derniere_modification', '_archive')
+    list_filter = ('archive', )
     fieldsets = (
         (None, {
-            'fields': ('nom', 'nom_long', ),
+            'fields': ('nom', 'nom_long', 'archive'),
         }),
     )
 
 
-class TypePosteAdmin(reversion.VersionAdmin, DerniereModificationAdmin,
+class TypePosteAdmin(reversion.VersionAdmin,
+                     ArchivableAdmin,
+                     DerniereModificationAdmin,
                      BaseAdmin):
     ignore_duplicate_revisions = True
     search_fields = ('nom', 'nom_feminin', )
-    list_display = ('nom', 'categorie_emploi', 'derniere_modification')
-    list_filter = ('categorie_emploi', 'famille_professionnelle')
+    list_display = ('nom', 'categorie_emploi',
+                     'derniere_modification', '_archive',)
+    list_filter = ('categorie_emploi', 'famille_professionnelle', 'archive')
     fieldsets = (
         (None, {
             'fields': (
                 'nom', 'nom_feminin', 'is_responsable', 'categorie_emploi',
                 'famille_professionnelle',
+                'archive',
             )
         }),
     )
@@ -1230,15 +1245,19 @@ class TypeRemunerationAdmin(reversion.VersionAdmin, ArchivableAdmin,
 
 
 class TypeRevalorisationAdmin(reversion.VersionAdmin,
-                              DerniereModificationAdmin, BaseAdmin):
+                              ArchivableAdmin,
+                              DerniereModificationAdmin,
+                              BaseAdmin):
     ignore_duplicate_revisions = True
-    list_display = ('nom', 'derniere_modification')
+    list_display = ('nom', 'derniere_modification', '_archive')
+    list_filter = ('archive', )
     fieldsets = (
-        (None, {'fields': ('nom',)}),
+        (None, {'fields': ('nom', 'archive')}),
     )
 
 
-class ValeurPointAdmin(reversion.VersionAdmin, DerniereModificationAdmin,
+class ValeurPointAdmin(reversion.VersionAdmin,
+                       DerniereModificationAdmin,
                        BaseAdmin):
     ignore_duplicate_revisions = True
     list_display = (