Change in models, templates, js

- Remove else condition in get_current_unit model method
- Reduce ajax timeout in course.js
- Create a new model method to set current unit
- Change views test

2 files changed, 5 insertions, 6 deletions

diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 567d01f..a3627d0 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -3,11 +3,10 @@
 {% block pagetitle %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png"
 width="80" alt="YAKSH"></img>{% endblock %}
 {% block content %}
-{% if module_id and not user == "moderator" %}
+{% if module_id and not paper.question_paper.quiz.is_trial %}
 <center>
     <div class="alert alert-info">
-        Note:- Please Click on the Next button to submit the quiz. Please do not close the browser
-        without clicking next.
+        Note:- Please Click on the Next button to submit the quiz. Please do not close the browser without clicking Next.
     </div>
 </center>
 {% endif %}
@@ -41,7 +40,7 @@ width="80" alt="YAKSH"></img>{% endblock %}
 	<center><h3>{{message}}</h3></center>
     <center>
     <br>
-    {% if module_id and not user == "moderator" %}
+    {% if module_id and not paper.question_paper.quiz.is_trial %}
         {% if first_unit %}
             <a href="{{URL_ROOT}}/exam/next_unit/{{course_id}}/{{module_id}}/{{learning_unit.id}}/1" class="btn btn-info" id="Next"> Next
                 <span class="glyphicon glyphicon-chevron-right">
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index d069b5d..2bf725c 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -163,14 +163,14 @@
                         </div>
                     </td>
                     <td>
-                        {% if unit != "NA" %}
+                        {% if unit %}
                             {% if unit.type == 'quiz' %}
                                 {{unit.quiz.description}}
                             {% else %}
                                 {{unit.lesson.name}}
                             {% endif %}
                         {% else %}
-                            {{unit}}
+                            NA
                         {% endif%}
                     </td>
                     <td>