install quiz, fix last urls

diff --git a/app/settings.py b/app/settings.py
index dcfdc19e2ca5bbdf4bcb244099f0454866831fa6..bf01352331fc6661ca304b623d42a447790cf235 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -139,21 +139,25 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'telemeta',
     'jsonrpc',
-    #'south',
+    # 'south',
     'teleforma',
     'sorl.thumbnail',
     'django_extensions',
     'pagination',
     'postman',
-#    'private_files',
-    #'markup_mixin',
-    'notes',
-#    'jquery',
+    # 'private_files',
+    # 'markup_mixin',
+    #'notes',
+    # 'jquery',
     'timezones',
     'jqchat',
-#    'follow',
+    # 'follow',
     # 'googletools',
-     'telecaster',
+    'telecaster',
+    'multichoice',
+    'true_false',
+    'essay',
+    'quiz',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py
index 34ca3260afedfffc1ad574119f87a2917403b841..5e3cb9c8339fcda4069f9b3a109c205fc0da5591 100755 (executable)
--- a/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
@@ -336,8 +336,7 @@ class Home(models.Model):
                              default="Page d'accueil")
     text = HTMLField('Texte', blank=True)
     video = models.ForeignKey(Media, verbose_name="Video", null=True, blank=True)
-    modified_at = models.DateTimeField(u'Date de modification', auto_now=True,
-                                       default=datetime.datetime.now)
+    modified_at = models.DateTimeField(u'Date de modification', auto_now=True)
     periods = models.ManyToManyField('Period', related_name="home_texts",
                                      verbose_name=u'Périodes associées',
                                      blank=True, null=True)