From: Tom Walker <tomwalker0472@gmail.com>
Date: Sat, 19 Jul 2014 18:43:13 +0000 (+0100)
Subject: fixed small bug that meant selected questions were not saved when
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3222883030d8ada112c927590b787050b292bf21;p=django_quiz.git

fixed small bug that meant selected questions were not saved when
creating a new quiz, meaning that the questions would have to be
reselected after the quiz was created.
---

diff --git a/quiz/admin.py b/quiz/admin.py
index 2517bd9..c3f867b 100644
--- a/quiz/admin.py
+++ b/quiz/admin.py
@@ -31,21 +31,20 @@ class QuizAdminForm(forms.ModelForm):
         queryset=Question.objects.all().select_subclasses(),
         required=False,
         widget=FilteredSelectMultiple(
-            verbose_name=('Questions'),
+            verbose_name='Questions',
             is_stacked=False))
 
     def __init__(self, *args, **kwargs):
         super(QuizAdminForm, self).__init__(*args, **kwargs)
         if self.instance.pk:
-            self.fields['questions'].initial = self.instance.question_set.all()
+            self.fields['questions'].initial =\
+                self.instance.question_set.all().select_subclasses()
 
     def save(self, commit=True):
         quiz = super(QuizAdminForm, self).save(commit=False)
-        if commit:
-            quiz.save()
-        if quiz.pk:
-            quiz.question_set = self.cleaned_data['questions']
-            self.save_m2m()
+        quiz.save()
+        quiz.question_set = self.cleaned_data['questions']
+        self.save_m2m()
         return quiz
 
 
@@ -66,7 +65,7 @@ class MCQuestionAdmin(admin.ModelAdmin):
     list_filter = ('category',)
     fields = ('content', 'category', 'quiz', 'explanation')
 
-    search_fields = ('content', )
+    search_fields = ('content', 'explanation')
     filter_horizontal = ('quiz',)
 
     inlines = [AnswerInline]