diff options
| author | Prabhu Ramachandran | 2017-04-06 12:36:28 +0530 |
|---|---|---|
| committer | GitHub | 2017-04-06 12:36:28 +0530 |
| commit | 969cccf998059e0a800276759535a36d3529b3c6 (patch) | |
| tree | 387e80eb718e40ce5077c853eef1d2e89cd3693e /yaksh | |
| parent | 734ad94d177be8ad400eb6f97e98612ce099e56a (diff) | |
| parent | 09756c7db9341aace9e9ac25c9078c8cd4bf8399 (diff) | |
| download | online_test-969cccf998059e0a800276759535a36d3529b3c6.tar.gz online_test-969cccf998059e0a800276759535a36d3529b3c6.tar.bz2 online_test-969cccf998059e0a800276759535a36d3529b3c6.zip | |
Merge pull request #269 from adityacp/fix_question_paper
Allow teachers included in a course to add/edit questionpaper
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/templates/yaksh/courses.html | 18 | ||||
| -rw-r--r-- | yaksh/views.py | 4 |
2 files changed, 18 insertions, 4 deletions
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index 970d488..4d19fb9 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -130,19 +130,31 @@ </div> </div> </div> - <div class="col-md-4"> + <div> <p><b><a href="{{URL_ROOT}}/exam/manage/searchteacher/{{course.id}}/">Add Teacher</a></b></p> </div> - <div class="col-md-4"> + <div class="col-md-2"> <p><b><u>Quiz(zes)</u></b></p> {% if course.get_quizzes %} {% for quiz in course.get_quizzes %} <a href="{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/{{quiz.id}}/">{{ quiz.description }}</a><br> - {% endfor %} + {% endfor %} {% else %} <p><b>No quiz </b></p> {% endif %} </div> + <div class="col-md-4"> + <p><b><u>Question Paper(s)</u></b></p> + {% for quiz in course.get_quizzes %} + {% if quiz.questionpaper_set.get %} + <a href="{{URL_ROOT}}/exam/manage/designquestionpaper/{{ quiz.id }}/{{quiz.questionpaper_set.get.id}}/">Question Paper for {{ quiz.description }}</a><br> + {% else %} + <p>No Question Paper + <a href="#" onClick='location.replace("{{URL_ROOT}}/exam/manage/quiz/designquestionpaper/{{ quiz.id }}/");'>Add</a> + </p> + {% endif %} + {% endfor %} + </div> </div> <br/> <button class="btn btn-primary pull-right"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button> diff --git a/yaksh/views.py b/yaksh/views.py index 2adc2c3..661d472 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -859,7 +859,9 @@ def design_questionpaper(request, quiz_id, questionpaper_id=None): if not is_moderator(user): raise Http404('You are not allowed to view this page!') - + quiz = Quiz.objects.get(id=quiz_id) + if not quiz.course.is_creator(user) and not quiz.course.is_teacher(user): + raise Http404('This course does not belong to you') filter_form = QuestionFilterForm(user=user) questions = None marks = None |