将注册页面用户名和密码的验证改为了输入框失去焦点的时候才验证,防止发送大量请求。
增加注册的时候向后端发送邮箱字段。 整理 js 代码风格。
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrfHeader){
|
require(["jquery", "bs_alert", "csrf", "validation"], function ($, bs_alert, csrfHeader) {
|
||||||
$("#change_password-form").formValidation({
|
$("#change_password-form").formValidation({
|
||||||
framework: "bootstrap",
|
framework: "bootstrap",
|
||||||
fields: {
|
fields: {
|
||||||
@@ -13,22 +13,22 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf
|
|||||||
validators: {
|
validators: {
|
||||||
notEmpty: {
|
notEmpty: {
|
||||||
message: "请填写旧密码"
|
message: "请填写旧密码"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
new_password: {
|
new_password: {
|
||||||
validators: {
|
validators: {
|
||||||
notEmpty: {
|
notEmpty: {
|
||||||
message: "请填写新密码"
|
message: "请填写新密码"
|
||||||
},
|
},
|
||||||
stringLength: {
|
stringLength: {
|
||||||
min: 6,
|
min: 6,
|
||||||
max: 30,
|
max: 30,
|
||||||
message: '密码长度必须在6到30位之间'
|
message: '密码长度必须在6到30位之间'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onSuccess: function(e, data) {
|
onSuccess: function (e, data) {
|
||||||
data.fv.revalidateField('confirm_password');
|
data.fv.revalidateField('confirm_password');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
confirm_password: {
|
confirm_password: {
|
||||||
@@ -40,27 +40,27 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf
|
|||||||
original: $("#new_password"),
|
original: $("#new_password"),
|
||||||
message: "两次输入的密码必须一致"
|
message: "两次输入的密码必须一致"
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
).on('success.form.fv', function(e) {
|
).on('success.form.fv', function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
var username = $("#username").val();
|
var username = $("#username").val();
|
||||||
var new_password = $("#new_password ").val();
|
var new_password = $("#new_password ").val();
|
||||||
var password = $("#password").val();
|
var password = $("#password").val();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
beforeSend: csrfHeader,
|
beforeSend: csrfHeader,
|
||||||
url: "/api/change_password/",
|
url: "/api/change_password/",
|
||||||
data: {username: username, new_password: new_password , old_password : password},
|
data: {username: username, new_password: new_password, old_password: password},
|
||||||
dataType: "json",
|
dataType: "json",
|
||||||
method: "post",
|
method: "post",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
|
||||||
if(!data.code){
|
if (!data.code) {
|
||||||
window.location.href="/login/";
|
window.location.href = "/login/";
|
||||||
}
|
}
|
||||||
else{
|
else {
|
||||||
bs_alert(data.data);
|
bs_alert(data.data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrfHeader){
|
require(["jquery", "bs_alert", "csrf", "validation"], function ($, bs_alert, csrfHeader) {
|
||||||
$("#login-form")
|
$("#login-form")
|
||||||
.formValidation({
|
.formValidation({
|
||||||
framework: "bootstrap",
|
framework: "bootstrap",
|
||||||
fields: {
|
fields: {
|
||||||
username: {
|
username: {
|
||||||
@@ -19,7 +19,7 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
).on('success.form.fv', function(e) {
|
).on('success.form.fv', function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
var username = $("#username").val();
|
var username = $("#username").val();
|
||||||
var password = $("#password").val();
|
var password = $("#password").val();
|
||||||
@@ -30,10 +30,10 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf
|
|||||||
dataType: "json",
|
dataType: "json",
|
||||||
method: "post",
|
method: "post",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
if(!data.code){
|
if (!data.code) {
|
||||||
window.location.href="/";
|
window.location.href = "/";
|
||||||
}
|
}
|
||||||
else{
|
else {
|
||||||
bs_alert(data.data);
|
bs_alert(data.data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrfHeader){
|
require(["jquery", "bs_alert", "csrf", "validation"], function ($, bs_alert, csrfHeader) {
|
||||||
$("#register-form")
|
$("#register-form")
|
||||||
.formValidation({
|
.formValidation({
|
||||||
framework: "bootstrap",
|
framework: "bootstrap",
|
||||||
icon: {
|
|
||||||
valid: 'glyphicon glyphicon-ok',
|
|
||||||
invalid: 'glyphicon glyphicon-remove',
|
|
||||||
validating: 'glyphicon glyphicon-refresh'
|
|
||||||
},
|
|
||||||
fields: {
|
fields: {
|
||||||
username: {
|
username: {
|
||||||
|
trigger: 'blur',
|
||||||
validators: {
|
validators: {
|
||||||
notEmpty: {
|
notEmpty: {
|
||||||
message: "请填写用户名"
|
message: "请填写用户名"
|
||||||
@@ -29,23 +25,23 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf
|
|||||||
validators: {
|
validators: {
|
||||||
notEmpty: {
|
notEmpty: {
|
||||||
message: "请填写密码"
|
message: "请填写密码"
|
||||||
},
|
},
|
||||||
stringLength: {
|
stringLength: {
|
||||||
min: 6,
|
min: 6,
|
||||||
max: 30,
|
max: 30,
|
||||||
message: '密码长度必须在6到30位之间'
|
message: '密码长度必须在6到30位之间'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onSuccess: function(e, data) {
|
onSuccess: function (e, data) {
|
||||||
data.fv.revalidateField('confirm_password');
|
data.fv.revalidateField('confirm_password');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
real_name: {
|
real_name: {
|
||||||
validators: {
|
validators: {
|
||||||
notEmpty: {
|
notEmpty: {
|
||||||
message: "请填写真实姓名"
|
message: "请填写真实姓名"
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
confirm_password: {
|
confirm_password: {
|
||||||
validators: {
|
validators: {
|
||||||
@@ -59,6 +55,7 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
email: {
|
email: {
|
||||||
|
trigger: 'blur',
|
||||||
validators: {
|
validators: {
|
||||||
notEmpty: {
|
notEmpty: {
|
||||||
message: "请填写电子邮箱邮箱地址"
|
message: "请填写电子邮箱邮箱地址"
|
||||||
@@ -75,22 +72,23 @@ require(["jquery", "bs_alert", "csrf", "validation"], function($, bs_alert, csrf
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
).on('success.form.fv', function(e) {
|
).on('success.form.fv', function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
var username = $("#username").val();
|
var username = $("#username").val();
|
||||||
var real_name = $("#real_name").val();
|
var real_name = $("#real_name").val();
|
||||||
var password = $("#password").val();
|
var password = $("#password").val();
|
||||||
|
var email = $("#email").val();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
beforeSend: csrfHeader,
|
beforeSend: csrfHeader,
|
||||||
url: "/api/register/",
|
url: "/api/register/",
|
||||||
data: {username: username, real_name: real_name, password: password},
|
data: {username: username, real_name: real_name, password: password, email: email},
|
||||||
dataType: "json",
|
dataType: "json",
|
||||||
method: "post",
|
method: "post",
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
if(!data.code){
|
if (!data.code) {
|
||||||
window.location.href="/login/";
|
window.location.href = "/login/";
|
||||||
}
|
}
|
||||||
else{
|
else {
|
||||||
bs_alert(data.data);
|
bs_alert(data.data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user