From 89c0367ba2364319e6febab191fd46b822b4f6bc Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Thu, 14 Feb 2019 15:05:42 +0530
Subject: Add Preview Question Paper button in add_quiz template

---
 yaksh/templates/exam.html           |  9 ---------
 yaksh/templates/yaksh/add_quiz.html | 11 ++++++++++-
 yaksh/views.py                      |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 0b292bb..29ad167 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -98,15 +98,6 @@
               {% endfor %}
             </tbody>
           </table>
-          <br>
-          {% if user.profile.is_moderator %}
-            {% if quiz.questionpaper_set.get %}
-              <a href="{{URL_ROOT}}/exam/manage/preview_questionpaper/{{quiz.questionpaper_set.get.id}}" class="btn btn-primary active btn-xs" target="_blank">
-                View Question Paper
-              </a>
-              <br>
-            {% endif %}
-          {% endif %}
       </div> <!--end of sidebar -->
       <a href="#sidebar" data-toggle="collapse" id="sidebaricon"><i class="fa fa-navicon fa-lg"></i></a>
 
diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html
index c955e65..246e0fb 100644
--- a/yaksh/templates/yaksh/add_quiz.html
+++ b/yaksh/templates/yaksh/add_quiz.html
@@ -37,8 +37,17 @@
 {% if quiz and course_id %}
     {% if quiz.questionpaper_set.get.id %}
     <center>
-    <h4>You can check the quiz by attempting it in the following modes:</h4>
       <a href="{{URL_ROOT}}/exam/manage/designquestionpaper/{{ quiz.id }}/{{quiz.questionpaper_set.get.id}}/{{course_id}}" class="btn btn-primary">View Question Paper</a>
+      {% if user.profile.is_moderator %}
+        {% if quiz.questionpaper_set.get %}
+          <a href="{{URL_ROOT}}/exam/manage/preview_questionpaper/{{quiz.questionpaper_set.get.id}}" class="btn btn-primary" target="_blank">
+            Preview Question Paper
+          </a>
+          <br>
+        {% endif %}
+      {% endif %}
+      <br>
+    <h4>You can check the quiz by attempting it in the following modes:</h4>
       <button class="btn btn-outline-info" type="button" name="button" onClick='usermode("{{URL_ROOT}}/exam/manage/usermode/{{quiz.id}}/{{course_id}}/");'>User Mode</button>
 
       <button class="btn btn-outline-info" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/godmode/{{quiz.id}}/{{course_id}}/");'>
diff --git a/yaksh/views.py b/yaksh/views.py
index bcaaf5f..6c7a12e 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -2822,6 +2822,8 @@ def _update_course_percent(course, user):
 @email_verified
 def preview_questionpaper(request, questionpaper_id):
     user = request.user
+    if not is_moderator(user):
+        raise Http404('You are not allowed to view this page!')
     paper = QuestionPaper.objects.get(id=questionpaper_id)
     if not paper.quiz.creator == user:
         raise Http404('This questionpaper does not belong to you')
-- 
cgit