]> git.parisson.com Git - teleforma.git/commitdiff
fix no topic
authorGuillaume Pellerin <yomguy@parisson.com>
Sat, 14 Jun 2014 00:13:18 +0000 (02:13 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sat, 14 Jun 2014 00:13:18 +0000 (02:13 +0200)
example/settings.py
teleforma/exam/views.py

index 72df9b5d97022f752326d5e4510bb3db5f17fdd2..a4b0c7d5097d44f76ce092ee114d5a6ef96a3c2d 100644 (file)
@@ -198,7 +198,7 @@ TELECASTER_MASTER_SERVER = 'angus.parisson.com'
 TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
 TELEFORMA_GLOBAL_TWEETER = False
 TELEFORMA_PERIOD_TWEETER = True
-TELEFORMA_EXAM_DEFAULT_DOCUMENT_TYPE_NUMBER = 2
+TELEFORMA_EXAM_TOPIC_DEFAULT_DOCUMENT_TYPE_NUMBER = 2
 
 JQCHAT_DISPLAY_COUNT = 50
 JQCHAT_DISPLAY_TIME  = 48
index 9fb0c55b4503593952e73cebc6019c73e2507224..3e8ed095887b6a5430aaa78a4fb9bb3555ec4af6 100644 (file)
@@ -23,10 +23,14 @@ class ScriptView(CourseAccessMixin, UpdateView):
         context['mark_fields'] = ['score', 'comments' ]
         context['reject_fields'] = ['reject_reason' ]
 
-        doc_type = DocumentType.objects.get(number=settings.TELEFORMA_EXAM_DEFAULT_DOCUMENT_TYPE_NUMBER)
+        doc_type = DocumentType.objects.get(number=settings.TELEFORMA_EXAM_TOPIC_DEFAULT_DOCUMENT_TYPE_NUMBER)
         topics = Document.objects.filter(course=script.course, period=script.period,
                                             session=script.session, type=doc_type)
-        context['topic'] = topics[0]
+        topic = None
+        if topics:
+            topic = topics[0]
+        context['topic'] = topic
+
         access = self.request.user == script.author or \
                     self.request.user == script.corrector or \
                     self.request.user.is_superuser or \