Merge branch 'master' of https://github.com/FOSSEE/online_test into improve-code-server

Conflicts Resolved:
	yaksh/templates/yaksh/question.html

1 files changed, 14 insertions, 3 deletions

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 3459be9..2740497 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -181,9 +181,13 @@ class QuizForm(forms.ModelForm):
         user = kwargs.pop('user')
         course_id = kwargs.pop('course')
         super(QuizForm, self).__init__(*args, **kwargs)
-        self.fields['prerequisite'] = forms.ModelChoiceField(
-                queryset=Quiz.objects.filter(course__id=course_id,
-                                             is_trial=False))
+
+        prerequisite_list = Quiz.objects.filter(
+            course__id=course_id,
+            is_trial=False
+        ).exclude(id=self.instance.id)
+
+        self.fields['prerequisite'] = forms.ModelChoiceField(prerequisite_list)
         self.fields['prerequisite'].required = False
         self.fields['course'] = forms.ModelChoiceField(
                 queryset=Course.objects.filter(id=course_id), empty_label=None)
@@ -240,6 +244,13 @@ class QuizForm(forms.ModelForm):
                                                 </p>
                                                 """)
 
+    def clean_prerequisite(self):
+        prereq = self.cleaned_data['prerequisite']
+        if prereq and prereq.prerequisite:
+            if prereq.prerequisite.id == self.instance.id:
+                raise forms.ValidationError("Please set another prerequisite quiz")
+        return prereq
+
     class Meta:
         model = Quiz
         exclude = ["is_trial"]