summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-03-22 16:56:51 +0530
committerGitHub2017-03-22 16:56:51 +0530
commitf9a787b84cdfe3932ea026f480d4b3f44dfa28a7 (patch)
tree36fc4a25ddd0973e1439380029e95c8b429c458a
parent99addf818d4b7c5c2d4ccecac7d50b0a5ea89a72 (diff)
parent4fc13eea1b9400f5c66d8c26cdcc58bcfe057dfb (diff)
downloadonline_test-f9a787b84cdfe3932ea026f480d4b3f44dfa28a7.tar.gz
online_test-f9a787b84cdfe3932ea026f480d4b3f44dfa28a7.tar.bz2
online_test-f9a787b84cdfe3932ea026f480d4b3f44dfa28a7.zip
Merge pull request #256 from ankitjavalkar/fix-tags
Fix issue and allow tags to be saved while saving questions
-rw-r--r--yaksh/templates/yaksh/moderator_dashboard.html32
-rw-r--r--yaksh/views.py2
2 files changed, 19 insertions, 15 deletions
diff --git a/yaksh/templates/yaksh/moderator_dashboard.html b/yaksh/templates/yaksh/moderator_dashboard.html
index 64167f8..0468ed9 100644
--- a/yaksh/templates/yaksh/moderator_dashboard.html
+++ b/yaksh/templates/yaksh/moderator_dashboard.html
@@ -32,24 +32,26 @@
</table>
<hr>
<center>
- <h5>Click on the button given below to add a new course.</h5>
- <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button>
- <h5>Click on the button to Create a Demo course.</h5>
- <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/create_demo_course");'>Create Demo Course</button>
- <a data-toggle="collapse" data-target="#help">
- <span class="glyphicon glyphicon-info-sign">Help</span></a>
+ <a href="{{URL_ROOT}}/exam/manage/add_course" class="btn btn-default">
+ Add New Course
+ </a>
+ <a href="{{URL_ROOT}}/exam/manage/create_demo_course" class="btn btn-default">
+ Create Demo Course
+ </a>
+ <a data-toggle="collapse" data-target="#help">
+ <span class="glyphicon glyphicon-question-sign"></span> What's This
+ </a>
<div id="help" class="collapse">
- <ul>
- <li>A Demo Course and Demo Quiz will be created (Click Courses link on nav bar to view courses).</li>
- <li>Some Demo Questions are also created for you (Click Questions link on nav bar to view questions).</li>
- <li>In Courses you can view Demo Quiz.</li>
- <li>Click on the Demo Quiz and Click on User Mode or God Mode to take the quiz.</li>
- <li>You can also edit the Demo quiz.</li>
- </ul>
- </p>
+ <ul>
+ <li>A Demo Course and Demo Quiz will be created (Click Courses link on nav bar to view courses).</li>
+ <li>Some Demo Questions are also created for you (Click Questions link on nav bar to view questions).</li>
+ <li>In Courses you can view Demo Quiz.</li>
+ <li>Click on the Demo Quiz and Click on User Mode or God Mode to take the quiz.</li>
+ <li>You can also edit the Demo quiz.</li>
+ </ul>
</div>
{% if msg %}
- <h4>{{ msg }}</h4>
+ <h4>{{ msg }}</h4>
{% endif %}
</center>
{% if trial_paper %}
diff --git a/yaksh/views.py b/yaksh/views.py
index bdb6f49..2adc2c3 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -183,6 +183,8 @@ def add_question(request, question_id=None):
question = qform.save(commit=False)
question.user = user
question.save()
+ # many-to-many field save function used to save the tags
+ qform.save_m2m()
for formset in formsets:
if formset.is_valid():
formset.save()