Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev

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

diff --git a/project/rh/admin.py b/project/rh/admin.py
index c9fd70d..609ab41 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -946,11 +946,21 @@ class ResponsableInline(admin.TabularInline):
 class ResponsableImplantationAdmin(BaseAdmin):
     actions = None
     list_filter = ('region', 'statut', )
 class ResponsableImplantationAdmin(BaseAdmin):
     actions = None
     list_filter = ('region', 'statut', )

-    list_display = ('nom', 'statut', '_responsable', )
+    list_display = ('_region', '_nom', 'statut', '_responsable', )

     readonly_fields = ('nom', )
     fields = ('nom', )
     inlines = (ResponsableInline, )
     readonly_fields = ('nom', )
     fields = ('nom', )
     inlines = (ResponsableInline, )

-
+    
+    def _region(self, obj):
+        return obj.region.code
+    _region.short_description = u"Région"
+    _region.admin_order_field = 'region__code'
+    
+    def _nom(self, obj):
+        return obj.nom
+    _nom.short_description = u"Implantation"
+    _nom.admin_order_field = 'nom'
+    

     def _responsable(self, obj):
         try:
             employe = obj.responsable.employe
     def _responsable(self, obj):
         try:
             employe = obj.responsable.employe