From 4d5cdce5f6e1bb15c773daabfff0e4c841cc6a26 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Wed, 13 Sep 2017 13:12:46 +0530
Subject: Fixes change password feature for moderators.

---
 yaksh/templates/manage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>
-- 
cgit 


From d8ef3fe1f52fae93dfaa27591661b7871dd0a179 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Tue, 19 Sep 2017 18:53:32 +0530
Subject: Fixes Nonetype object has attribute 'encode' error

---
 yaksh/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
cgit