summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--yaksh/templates/manage.html2
-rw-r--r--yaksh/views.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index c9025d2..d87076d 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -17,7 +17,7 @@
<li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
<li><a href="{{ URL_ROOT }}/exam/manage/courses">Courses</a></li>
<li><a href="{{ URL_ROOT }}/exam/viewprofile">My Profile</a></li>
- <li><a href="{{ URL_ROOT }}/exam/changepassword">Change Password</a></li>
+ <li><a href="{{ URL_ROOT }}/exam/reset/changepassword">Change Password</a></li>
<li><a href="{{ URL_ROOT }}/exam/manage/grader"> Grader </a></li>
<li><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'>Log out</a></li>
</ul>
diff --git a/yaksh/views.py b/yaksh/views.py
index 3f9f622..e6da2fc 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -488,7 +488,8 @@ def show_question(request, question, paper, error_message=None, notification=Non
answers = paper.get_previous_answers(question)
if answers:
last_attempt = answers[0].answer
- context['last_attempt'] = last_attempt.encode('unicode-escape')
+ if last_attempt:
+ context['last_attempt'] = last_attempt.encode('unicode-escape')
ci = RequestContext(request)
return my_render_to_response('yaksh/question.html', context,
context_instance=ci)