Merge pull request #300 from ankitjavalkar/validate-quiz-prerequisite

Validate quiz prerequisite field

1 files changed, 11 insertions, 17 deletions

diff --git a/yaksh/views.py b/yaksh/views.py
index db45a89..7f907aa 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -256,30 +256,24 @@ def add_quiz(request, course_id, quiz_id=None):
             if form.is_valid():
                 form.save()
                 return my_redirect("/exam/manage/courses/")
-            else:
-                context["form"] = form
-                return my_render_to_response('yaksh/add_quiz.html',
-                                             context,
-                                             context_instance=ci)
+
         else:
             quiz = Quiz.objects.get(id=quiz_id)
             form = QuizForm(request.POST, user=user, course=course_id,
-                            instance=quiz)
+                instance=quiz
+            )
             if form.is_valid():
                 form.save()
-                context["quiz_id"] = quiz_id
                 return my_redirect("/exam/manage/courses/")
+
     else:
-        if quiz_id is None:
-            form = QuizForm(course=course_id, user=user)
-        else:
-            quiz = Quiz.objects.get(id=quiz_id)
-            form = QuizForm(user=user,course=course_id, instance=quiz)
-            context["quiz_id"] = quiz_id
-        context["form"] = form
-        return my_render_to_response('yaksh/add_quiz.html',
-                                     context,
-                                     context_instance=ci)
+        quiz = Quiz.objects.get(id=quiz_id) if quiz_id else None
+        form = QuizForm(user=user,course=course_id, instance=quiz)
+        context["quiz_id"] = quiz_id
+    context["form"] = form
+    return my_render_to_response('yaksh/add_quiz.html',
+                                 context,
+                                 context_instance=ci)
 
 @login_required
 @email_verified