Correction des conflits

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index aeaa6fb..06e2ccf 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -223,7 +223,7 @@ class EvaluateurAdmin(VersionAdmin):
         (None, {'fields': ('candidats',)}),
     )
 
-    def get_form(self, request, obj=None, **kwargs):
+    '''def get_form(self, request, obj=None, **kwargs):
         """
         Affiche la liste des users, regions et candidats, seulement si le user
         connecté possède un Evaluateur
@@ -253,6 +253,7 @@ class EvaluateurAdmin(VersionAdmin):
             return form
 
         return form
+    '''
 
     def queryset(self, request):
         """ 

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index b9664bf..a126996 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -198,7 +198,7 @@ class CandidatEvaluation(models.Model):
         verbose_name = 'évaluation du candidat'
         verbose_name_plural = 'évaluations des candidats'
 
-### TEMPLATE COURRIEL
+#### TEMPLATE COURRIEL
 TEMPLATE_CHOICES = (
     ('SEL', 'Sélectionné'),
     ('REF', 'Refusé'),