From 657b7c4f5119fc2c7e586b9d026456a2720ab7f9 Mon Sep 17 00:00:00 2001
From: spxcds <jvbei@live.com>
Date: Sun, 27 Mar 2016 20:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/user/userList.js | 10 ++++++----
 template/src/admin/user/user_list.html   |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/static/src/js/app/admin/user/userList.js b/static/src/js/app/admin/user/userList.js
index b382f91..723c6df 100644
--- a/static/src/js/app/admin/user/userList.js
+++ b/static/src/js/app/admin/user/userList.js
@@ -22,7 +22,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "pager", "validator"],
                     userId: -1,
                     openAPI: false,
                     tfa_auth: false,
-                     is_forbidden: false,
+                    is_forbidden: false,
+                    password: "",
 
                     pager: {
                         getPage: function (page) {
@@ -47,6 +48,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "pager", "validator"],
                     }
                 });
             }
+
             vm.$watch("showAdminOnly", function () {
                 getPage(1);
                 avalon.vmodels.userPager.currentPage = 1;
@@ -88,8 +90,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "pager", "validator"],
                             tfa_auth: vm.tfa_auth,
                             is_forbidden : vm.is_forbidden
                         };
-                        if ($("#password").val() !== "")
-                            data.password = $("#password").val();
+                        if (vm.password != "")
+                            data.password = vm.password;
                         $.ajax({
                             url: "/api/admin/user/",
                             data: data,
@@ -99,7 +101,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "pager", "validator"],
                                 if (!data.code) {
                                     bsAlert("编辑成功！");
                                     getPage(1);
-                                    $("#password").val("");
+                                    vm.password = "";
                                     vm.isEditing = false;
                                 } else {
                                     bsAlert(data.data);
diff --git a/template/src/admin/user/user_list.html b/template/src/admin/user/user_list.html
index cc431e6..75133c1 100644
--- a/template/src/admin/user/user_list.html
+++ b/template/src/admin/user/user_list.html
@@ -60,7 +60,8 @@
             </div>
             <div class="row">
                 <div class="form-group col-md-4"><label>新密码（留空则保留原密码）</label>
-                    <input type="password" class="form-control" autocomplete="off"
+                    <input name="password" type="password" class="form-control"
+                           autocomplete="off" ms-duplex="password"
                            placeholder="此项留空则保留原密码" data-minlength="6" data-minlength-error="密码不得少于6位">
                     <div class="help-block with-errors"></div>
                 </div>