no delete + actif par defaut

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

diff --git a/project/rh/lib.py b/project/rh/lib.py
index 1f349e2..5e90199 100644 (file)
--- a/project/rh/lib.py
+++ b/project/rh/lib.py
@@ -16,9 +16,6 @@ from forms import ContratForm, AyantDroitForm, EmployeAdminForm, AjaxSelect
 from dae.utils import get_employe_from_user
 
 
-# Desactivation des bactch action a cause des managers qui delete
-AUFMetadataAdminMixin.actions = None
-
 # Override of the InlineModelAdmin to support the link in the tabular inline
 class LinkedInline(admin.options.InlineModelAdmin):
     template = "admin/linked.html"
@@ -268,12 +265,14 @@ class DossierAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin,
         '_date_debut',
         '_date_fin',
         'date_modification',
+        'actif',
     )
     list_filter = (
         'poste__implantation__region',
         'poste__implantation',
         'poste__type_poste',
         'poste__type_poste__famille_emploi',
+        'actif',
     )
     inlines = (DossierPieceInline, ContratInline,
                RemunerationInline,
@@ -396,7 +395,7 @@ class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin):
     search_fields = ('id', 'nom', 'prenom', 'nom_affichage', )
     ordering = ('nom', )
     form = EmployeAdminForm
-    list_display = ('_nom', '_dossiers', 'date_modification',  'user_modification',)
+    list_display = ('_nom', '_dossiers', 'date_modification',  'user_modification', 'actif',)
     list_filter = ('rh_dossiers__poste__implantation__region',  'rh_dossiers__poste__implantation', 'actif', )
     inlines = (AyantDroitInline,
                DossierROInline,
@@ -442,10 +441,11 @@ class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin):
             l.append(link)
         return "<ul>%s</ul>" % "\n".join(l)
     _dossiers.allow_tags = True
+    _dossiers.short_description = u"Dossiers"
 
     def queryset(self, request):
         qs = super(EmployeAdmin, self).queryset(request) 
-        return qs.filter(actif=True).select_related(depth=1).order_by('nom')
+        return qs.select_related(depth=1).order_by('nom')
 
     def save_formset(self, request, form, formset, change):
         instances = formset.save(commit=False)
@@ -516,12 +516,14 @@ class PosteAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin, Aj
         'date_fin',
         'date_modification',
         'user_modification',
+        'actif',
         )
     list_filter = ('service', 
         'implantation__region', 
         'implantation',
         'type_poste',
         'type_poste__famille_emploi',
+        'actif',
         )
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
         (None, {