Amélioration des noms de libellés lors de l'ajout d'un candidat

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index 1b5aaae..ab6ee9f 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -49,12 +49,32 @@ class OffreEmploiAdmin(VersionAdmin):
         region_ids = [g.id for g in user.regions.all()]
         return qs.select_related('offre_emploi').filter(region__in=region_ids)
 
+class ProxyCandidatPiece(CandidatPiece):
+    """
+    Ce proxy sert uniquement dans l'admin à disposer d'un libellé
+    plus ergonomique.
+    """
+    class Meta:
+        proxy = True
+        verbose_name = "pièce jointe"
+        verbose_name = "pièces jointe"
+
 class CandidatPieceInline(admin.TabularInline):
-    model = CandidatPiece
+    model = ProxyCandidatPiece
+    fields = ('candidat', 'nom', 'path', )
     extra = 1
 
+class ProxyEvaluateur(UserProfile.candidats.through):
+    """
+    Ce proxy sert uniquement dans l'admin à disposer d'un libellé
+    plus ergonomique.
+    """
+    class Meta:
+        proxy = True
+        verbose_name = "évaluateur"
+
 class EvaluateurInline(admin.TabularInline):
-    model = UserProfile.candidats.through
+    model = ProxyEvaluateur
     extra = 1
 
 class CandidatAdmin(VersionAdmin):

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index 9b91612..9fbdcb4 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -140,14 +140,14 @@ class CandidatPiece(models.Model):
 
 class UserProfile(models.Model):
     user = models.ForeignKey("auth.User", unique=True,
-            verbose_name="Permission")
-    candidats = models.ManyToManyField(Candidat, verbose_name='Candidats', 
+            verbose_name="évaluateur")
+    candidats = models.ManyToManyField(Candidat, verbose_name='candidats', 
                 blank=True, null=True,related_name="evaluateurs")
     regions = models.ManyToManyField(ref.Region, 
                            verbose_name="Régions", )
 
     class Meta:
-        verbose_name = "permission"
+        verbose_name = "évaluateur"
 
     def __unicode__(self):
         return '%s %s' % (self.user.first_name, self.user.last_name)
@@ -156,13 +156,13 @@ UserProfile.profile = property(lambda u: UserProfile.objects.get_or_create(user=
 
 class CandidatEvaluation(models.Model):
     candidat = models.ForeignKey(Candidat, db_column='candidat', 
-                related_name='+') 
+                related_name='+', verbose_name = 'test') 
     evaluateur = models.ForeignKey(UserProfile, db_column='evaluateur', 
-                    related_name='+', verbose_name="Évaluateur") 
+                    related_name='+', verbose_name='Évaluateur') 
     note = models.IntegerField(choices=NOTES, blank=True, null=True)
     commentaire = models.TextField(null=True, blank=True)
     date = models.DateField(auto_now_add=True)  
 
     class Meta:
-        verbose_name = "évaluation du candidat"
-        verbose_name_plural = "évaluations des candidats"
+        verbose_name = 'évaluation du candidat'
+        verbose_name_plural = 'évaluations des candidats'