From ae85cab3ed5eca0d99373d6fae2011a233e5ad05 Mon Sep 17 00:00:00 2001
From: gothack329 <gothack.329@gmail.com>
Date: Wed, 7 Mar 2018 17:56:48 +0800
Subject: [PATCH] fix bugs

---
 userpage/__pycache__/views.cpython-36.pyc | Bin 4204 -> 4148 bytes
 userpage/templates/userpage/change.html   |  25 +++++++++++++++++++++-
 userpage/views.py                         |   9 ++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/userpage/__pycache__/views.cpython-36.pyc b/userpage/__pycache__/views.cpython-36.pyc
index 4a0f0bbe3835741f37a1f44c654ef6167d45e47e..3e59901e94ef0ed4e74861808bf698e292a30888 100644
GIT binary patch
delta 159
zcmaE(utkB>n3tDpN!k3UwvC(;ynHzf3=B04Sqv$R*-S+~ll6JURb6TrvsjxM7#T{~
zY8ZfQre-D}n>~x8h9QL+#Li<V;ha2?SD2A&@>1Re{wVI`jKsY3)cCagqFhbx$vk{2
zyaGUDZ?PAbCMTyB7f%l4vz8D7iZC#7F$yqp03i<}9~%b~4`WgC=2d*TjEu>XB?LkM
D=7A&2

delta 229
zcmdm@@J4~tn3tEUdHKAk(2blDynK@w7#M08vKUervzdyDChPNx#|P9fX0bLiFfx>|
z)i40rOwCL{HhT$24P!G90@<8dTr~_S%pmbRDIkv<td0k!u7ne+jyHv+nK785gb`>1
zQwnP@V=ZF|-{gAU1oomRpuL*>li%^GD0%^zx0q8hi;4t5EcW8k<mA-i;vx$mugDTe
tOqS=fmXiQ77?`*i1sFMikOv6)nD~Gs2NMrtQOf2bzFbDel*teHLjZ!cF!%rf

diff --git a/userpage/templates/userpage/change.html b/userpage/templates/userpage/change.html
index 8bfef3e..bc1993f 100644
--- a/userpage/templates/userpage/change.html
+++ b/userpage/templates/userpage/change.html
@@ -18,13 +18,36 @@
         <form class="form-inline " method="post" action="" novalidate>{% csrf_token %}
         	<a href="/">物志</a> › 修改密码
         	<hr>
-{{form.as_p}}
+{{change_form.as_p}}
             <p style="text-align:center">
             	<button class="btn btn-primary" type="submit" >确认修改</button>
             </p>
         </form>
     </div>
 
+    {% if change_form.errors %}
+        {% for field in change_form %}
+        {{field}}
+            {% for error in field.errors %}
+                <script type="text/javascript">
+                $.notify({
+                    // options
+                    message: '{{ error|escape }}',
+                },{
+                    // settings
+                    type: 'danger',
+                    delay: 5000,
+                    timer: 1000,
+                    animate: {
+                        enter: 'animated flipInY',
+                        exit: 'animated flipOutX'
+                    },
+                },);
+               </script>
+            {% endfor %}
+        {% endfor %}
+    {% endif %}  
+
 
 
     {% if messages %}
diff --git a/userpage/views.py b/userpage/views.py
index e952251..8fe93cb 100644
--- a/userpage/views.py
+++ b/userpage/views.py
@@ -156,13 +156,14 @@ def password_change(request):
         if form.is_valid():
             form.save()
             update_session_auth_hash(request, form.user)
-            print(dir(form))
             messages.success(request,'密码修改成功!')
         else:
-            messages.error(request,form.errors)
-            print(dir(messages))
+            #print(form.errors.as_data())
+            messages.error(request,form.errors.as_json())
+            #print(dir(messages))
+            pass
         return redirect('.')
     else:
         form = PasswordChangeForm(user=request.user)
-        return render(request,'userpage/change.html',{'form':form})
+        return render(request,'userpage/change.html',{'change_form':form})
     
\ No newline at end of file