et --hard

commit e14cc35f1bcf51876ac96dee3f89a26aa52c1a28 (HEAD -> master)
Author: jwlrai <jwolrai@gmail.com>
Date:   Thu Dec 20 09:45:36 2018 -0800

    before pull

diff --git a/storyteller/templates/page/base.html b/storyteller/templates/page/base.html
index fe6d286c..ce52d54a 100644
--- a/storyteller/templates/page/base.html
+++ b/storyteller/templates/page/base.html
@@ -76,7 +76,7 @@
                     <a class="nav-link lnav wclr" id="profile" href="{% url 'profile' %}" >Profile</a>
                 </li>
                 <li class="nav-item llg">  
-                    <a class="nav-link lnav wclr" href="{% url 'logout' %}" >Log out</a>
+                    <a class="nav-link lnav wclr" href="/user/logout" >Log out</a>
                 </li>
                 {% endif%}
             </ul>
diff --git a/user/__pycache__/views.cpython-37.pyc b/user/__pycache__/views.cpython-37.pyc
index 87ecfd8f..fb6bcad8 100644
Binary files a/user/__pycache__/views.cpython-37.pyc and b/user/__pycache__/views.cpython-37.pyc differ
diff --git a/user/views.py b/user/views.py
index e8e7ce33..b8288727 100644
--- a/user/views.py
+++ b/user/views.py
@@ -137,9 +137,10 @@ def userProfileEdit(request) :
                               else :
                                    cursor.execute("UPDATE auth_user SET username = '"+username+"' WHERE id = "+str( request.user.id ) )
                          else : # password change
-                              User.objects.filter(id = request.user.id).update(password = password)
-                              # newpassword = hashers.make_password( password )
-                              # cursor.execute("UPDATE auth_user SET password = '"+newpassword+"' WHERE id = "+str(request.user.id) )
+                              u = User.objects.get(id = request.user.id)
+                              u.set_password( password )
+                              u.save()
+                             
              
           return JsonResponse({'message':error,'csrf':csrf.get_token(request)})
      else :