From 164e44b3982d3125635ce32ee5ae1a612e311a6b Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Mon, 17 Aug 2015 14:51:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=8E=89=E5=95=86=E4=B8=9A=E7=89=88=E7=9A=84?=
=?UTF-8?q?=20formvalidation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
static/src/js/app/admin/user/userList.js | 97 +++++++-----------------
template/admin/problem/edit_problem.html | 2 +-
template/admin/user/user_list.html | 15 +++-
3 files changed, 40 insertions(+), 74 deletions(-)
diff --git a/static/src/js/app/admin/user/userList.js b/static/src/js/app/admin/user/userList.js
index 277aa88..0842dc5 100644
--- a/static/src/js/app/admin/user/userList.js
+++ b/static/src/js/app/admin/user/userList.js
@@ -1,4 +1,4 @@
-require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function ($, avalon, csrfTokenHeader, bsAlert) {
+require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, avalon, csrfTokenHeader, bsAlert) {
// avalon:定义模式 userList
@@ -87,77 +87,36 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function
});
}
- $("#edit_user-form")
- .formValidation({
- framework: "bootstrap",
- fields: {
- username: {
- validators: {
- notEmpty: {
- message: "请填写用户名"
- },
- stringLength: {
- min: 3,
- max: 30,
- message: '用户名长度必须在3到30位之间'
+ $("#edit_user-form").validator()
+ .on('submit', function (e) {
+ if (!e.isDefaultPrevented()) {
+ var data = {
+ username: vm.username,
+ real_name: vm.realName,
+ email: vm.email,
+ id: vm.id,
+ admin_type: vm.adminType
+ };
+ if ($("#password").val() !== "")
+ data.password = $("#password").val();
+ $.ajax({
+ beforeSend: csrfTokenHeader,
+ url: "/api/admin/user/",
+ data: data,
+ dataType: "json",
+ method: "put",
+ success: function (data) {
+ if (!data.code) {
+ bsAlert("编辑成功！");
+ getPageData(1);
+ $("#password").val("");
+ } else {
+ bsAlert(data.data);
}
}
- },
- real_name: {
- validators: {
- notEmpty: {
- message: "请填写真实姓名"
- }
- }
- },
- email: {
- validators: {
- notEmpty: {
- message: "请填写电子邮箱邮箱地址"
- },
- emailAddress: {
- message: "请填写有效的邮箱地址"
- }
- }
- },
- password: {
- validators: {
- stringLength: {
- min: 6,
- max: 30,
- message: '密码长度必须在6到30位之间'
- }
- }
- }
+ });
+ return false;
}
- }
- ).on('success.form.fv', function (e) {
- e.preventDefault();
- var data = {
- username: vm.username,
- real_name: vm.realName,
- email: vm.email,
- id: vm.id,
- admin_type: vm.adminType
- };
- if ($("#password").val() !== "")
- data.password = $("#password").val();
- $.ajax({
- beforeSend: csrfTokenHeader,
- url: "/api/admin/user/",
- data: data,
- dataType: "json",
- method: "put",
- success: function (data) {
- if (!data.code) {
- bsAlert("提交成功！");
- getPageData(1);
- $("#password").val("");
- } else {
- bsAlert(data.data);
- }
- }
- })
});
});
diff --git a/template/admin/problem/edit_problem.html b/template/admin/problem/edit_problem.html
index 02ec147..2b63b2c 100644
--- a/template/admin/problem/edit_problem.html
+++ b/template/admin/problem/edit_problem.html
@@ -17,7 +17,7 @@