From e9907cee5272d0234810e9d2943c86e093b40acb Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sat, 14 Jun 2014 02:13:18 +0200 Subject: [PATCH] fix no topic --- example/settings.py | 2 +- teleforma/exam/views.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/example/settings.py b/example/settings.py index 72df9b5d..a4b0c7d5 100644 --- a/example/settings.py +++ b/example/settings.py @@ -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 diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index 9fb0c55b..3e8ed095 100644 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -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 \ -- 2.39.5