From 634b57290140a151d0a9ba2b4d424b478a3d8fb3 Mon Sep 17 00:00:00 2001
From: virusdefender <qduliyang@outlook.com>
Date: Mon, 30 May 2016 16:46:13 +0800
Subject: [PATCH] =?UTF-8?q?admin=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E7=94=A8=E6=88=B7=E6=8F=90=E4=BA=A4=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/static/src/js/app/admin/user/userList.js b/static/src/js/app/admin/user/userList.js
index 723c6df21..5951818e3 100644
--- a/static/src/js/app/admin/user/userList.js
+++ b/static/src/js/app/admin/user/userList.js
@@ -100,7 +100,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "pager", "validator"],
                             success: function (data) {
                                 if (!data.code) {
                                     bsAlert("编辑成功！");
-                                    getPage(1);
+                                    getPage(avalon.vmodels.userPager.currentPage);
                                     vm.password = "";
                                     vm.isEditing = false;
                                 } else {
diff --git a/template/src/admin/user/user_list.html b/template/src/admin/user/user_list.html
index 75133c11d..604a39700 100644
--- a/template/src/admin/user/user_list.html
+++ b/template/src/admin/user/user_list.html
@@ -19,7 +19,7 @@ <h1>用户管理</h1>
             <th>真实姓名</th>
             <th>电子邮箱</th>
             <th>用户类型</th>
-            <th>修改</th>
+            <th>管理</th>
         </tr>
         <tr ms-repeat="userList">
             <td>{{ el.id }}</td>
@@ -30,6 +30,7 @@ <h1>用户管理</h1>
             <td>{{ userType[el.admin_type]}}</td>
             <td>
                 <button class="btn-sm btn-info" ms-click="editUser(el)">编辑</button>
+                <a class="btn btn-primary" ms-attr-href="'/submissions/?user_id='+el.id" target="_blank">提交</a>
             </td>
         </tr>
     </table>