Correction au UserProfile, remplacer foreign key par User, au lieu de auth.User

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index 50b7a83..13fc1fa 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -160,7 +160,7 @@ class CandidatPiece(models.Model):
         return '%s' % (self.nom)
 
 class UserProfile(models.Model):
-    user = models.ForeignKey("auth.User", unique=True,
+    user = models.ForeignKey("User", unique=True,
             verbose_name="permission")
     candidats = models.ManyToManyField(Candidat, verbose_name='candidats', 
                 blank=True, null=True,related_name="evaluateurs")
@@ -195,23 +195,22 @@ TEMPLATE_CHOICES = (
 )
 
 class CourrielTemplate(models.Model):
-    template_name = models.CharField(max_length=100, )
-    subject = models.CharField(max_length=100, )
-    heading = models.CharField(max_length=100, )
-    plain_text = models.TextField()
-    html = models.TextField()
+    nom_modele = models.CharField(max_length=100, verbose_name='Nom modèle', )
+    sujet = models.CharField(max_length=100, )
+    plain_text = models.TextField(verbose_name='Texte', )
+    html = tinymce_models.HTMLField(verbose_name='Texte HTML', )
 
     def __unicode__(self):
-        return u'%s' % self.template_name
+        return u'%s' % self.nom_modele
 
     class Meta:
-        ordering = ['template_name',]
+        ordering = ['nom_modele',]
 
 class CandidatCourriel(models.Model):
     candidat = models.ForeignKey(Candidat, db_column='candidat', 
                 related_name='+', ) 
-    template = models.CharField(max_length=4, choices=TEMPLATE_CHOICES, 
-                default='SEL', verbose_name="Modèle de courriel", )
+    template = models.ForeignKey(CourrielTemplate, db_column='nom', 
+                related_name='+', verbose_name="Modèle de courriel", )
     titre = models.CharField(max_length=255, )
     texte = models.TextField(null=True, blank=True, )