[#2374] No. employé partout

diff --git a/project/rh/lib.py b/project/rh/lib.py
index b17485b..eed02e0 100644 (file)
--- a/project/rh/lib.py
+++ b/project/rh/lib.py
@@ -74,6 +74,7 @@ class ContratInline(AUFMetadataInlineAdminMixin, admin.TabularInline):
 class DossierROInline(ReadOnlyInlineMixin, admin.TabularInline):
     exclude = AUF_METADATA_READONLY_FIELDS
     model = models.Model  # à remplacer dans admin.py
 class DossierROInline(ReadOnlyInlineMixin, admin.TabularInline):
     exclude = AUF_METADATA_READONLY_FIELDS
     model = models.Model  # à remplacer dans admin.py

+    extra = 0

 
 
 class DossierCommentaireInline(AUFMetadataInlineAdminMixin, admin.TabularInline):
 
 
 class DossierCommentaireInline(AUFMetadataInlineAdminMixin, admin.TabularInline):

@@ -333,7 +334,8 @@ class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin):
     list_filter = ('actif', )
     ordering = ('nom', )
     actions = ('desactiver', )
     list_filter = ('actif', )
     ordering = ('nom', )
     actions = ('desactiver', )

-    list_display = ('nom', 'prenom', 'actif', )
+    list_display = ('id', 'nom', 'prenom', 'actif', )
+    list_display_links = ('id', 'nom',)

     inlines = (AyantDroitInline,
                DossierROInline,
                EmployePieceInline,
     inlines = (AyantDroitInline,
                DossierROInline,
                EmployePieceInline,

diff --git a/project/rh/models.py b/project/rh/models.py
index 3cd607c..adb4bc0 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -345,7 +345,7 @@ class Employe(AUFMetadata):
         verbose_name_plural = u"Employés"
         
     def __unicode__(self):
         verbose_name_plural = u"Employés"
         
     def __unicode__(self):

-        return u'%s' % (self.get_nom())
+        return u'%s [%s]' % (self.get_nom(), self.id)

         
     def get_nom(self):
         nom_affichage = self.nom_affichage
         
     def get_nom(self):
         nom_affichage = self.nom_affichage