diff options
| author | maheshgudi | 2016-09-07 16:14:54 +0530 |
|---|---|---|
| committer | maheshgudi | 2016-09-07 16:14:54 +0530 |
| commit | 6e2a0db4d67902cca52277d22dd7a67ebd059268 (patch) | |
| tree | 770b9067974b572e3378c40a613567c1c49f4029 /yaksh | |
| parent | 8b01d249b7ccdff9d75447a6b12eb96641e795e7 (diff) | |
| download | online_test-6e2a0db4d67902cca52277d22dd7a67ebd059268.tar.gz online_test-6e2a0db4d67902cca52277d22dd7a67ebd059268.tar.bz2 online_test-6e2a0db4d67902cca52277d22dd7a67ebd059268.zip | |
removed initial form field from QuizForm and minor fixes in add_quiz view function and courses template
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/forms.py | 5 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/courses.html | 3 | ||||
| -rw-r--r-- | yaksh/views.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/yaksh/forms.py b/yaksh/forms.py index 62179d5..23131b7 100644 --- a/yaksh/forms.py +++ b/yaksh/forms.py @@ -156,12 +156,11 @@ class QuizForm(forms.ModelForm): course_id = kwargs.pop('course') super(QuizForm, self).__init__(*args, **kwargs) self.fields['prerequisite'] = forms.ModelChoiceField( - queryset=Quiz.objects.filter(course__creator=user, + queryset=Quiz.objects.filter(course__id=course_id, is_trial=False)) self.fields['prerequisite'].required = False self.fields['course'] = forms.ModelChoiceField( - queryset=Course.objects.filter(id=course_id)) - self.fields['course'].initial = Course.objects.get(id=course_id) + queryset=Course.objects.filter(id=course_id), empty_label=None) class Meta: model = Quiz diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index ba7d09f..109b996 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -147,7 +147,8 @@ <br><br> {% endfor %} {% else %} - <center><h4> No new Courses allotted <br><br></h4></center> + <center><h4> No new Courses allotted</h4></center> + <br><br> {% endif %} <center><button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button></center> diff --git a/yaksh/views.py b/yaksh/views.py index dcf6133..fa4dac6 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -250,7 +250,7 @@ def add_quiz(request, course_id, quiz_id=None): """To add a new quiz in the database. Create a new quiz and store it.""" user = request.user - course = Course.objects.get(id=course_id) + course = get_object_or_404(Course, pk=course_id) ci = RequestContext(request) if not is_moderator(user) or (user != course.creator and user not in course.teachers.all()): raise Http404('You are not allowed to view this page!') |