From 65c4cbd928d2a3b8f155aed48536169f040350f1 Mon Sep 17 00:00:00 2001 From: Nilovna Bascunan-Vasquez Date: Thu, 7 Jul 2011 14:32:44 -0400 Subject: [PATCH] =?utf8?q?Changement=20de=20l'ordre=20des=20status=20d'un=20?= =?utf8?q?Candidat,=20Changement=20de=20nom=20du=20fieldset=20Options=20Avan?= =?utf8?q?c=C3=A9es->Traitement=20et=20retrait=20du=20champ=20actif?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- project/recrutement/admin.py | 7 +++---- project/recrutement/models.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py index 6c42447..58730ed 100644 --- a/project/recrutement/admin.py +++ b/project/recrutement/admin.py @@ -72,7 +72,7 @@ class OffreEmploiAdmin(VersionAdmin): class ProxyOffreEmploiAdmin(OffreEmploiAdmin): list_display = ('nom', 'resume', 'date_limite', 'region', ) - readonly_fields = ('actif', 'description', 'poste', 'bureau', + readonly_fields = ('description', 'poste', 'bureau', 'duree_affectation', 'renumeration', 'debut_affectation', 'lieu_affectation', 'nom', 'resume', 'date_limite', 'region') @@ -155,9 +155,8 @@ class CandidatAdmin(VersionAdmin): 'fields': ('niveau_diplome','employeur_actuel', 'poste_actuel', 'domaine_professionnel',) }), - ('Options avancées', { - 'classes': ('collapse',), - 'fields': ('actif', 'statut', ) + ('Traitement', { + 'fields': ('statut', ) }), ) inlines = [ diff --git a/project/recrutement/models.py b/project/recrutement/models.py index 3463aa4..f0c7da5 100755 --- a/project/recrutement/models.py +++ b/project/recrutement/models.py @@ -92,10 +92,10 @@ SITUATION_CHOICES = ( ) STATUT_CHOICES = ( ('NOUV', 'Nouveau'), - ('REF', 'Refusé'), + ('REC', 'Recevable'), ('SEL', 'Sélectionné'), + ('REF', 'Refusé'), ('ACC', 'Accepté'), - ('REC', 'Recevable'), # Trouver une lettre plus appropriée? ) class Candidat(Metadata): -- 1.7.10.4