Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix redirect after updating profile

Browse Source
This commit is contained in:
gplane 2017-04-27 16:38:40 +08:00
parent d9552e268c
commit 2ca383628e
2 changed files with 55 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
resources/assets/src/scripts/general.js
View File

@ -2,7 +2,7 @@
* @Author: printempw
* @Date: 2016-09-15 10:39:41
* @Last Modified by: g-plane
* @Last Modified time: 2017-04-26 23:58:06
* @Last Modified time: 2017-04-27 15:33:24
*/
'use strict';
@ -222,18 +222,11 @@ function confirmLogout() {
}
function logout() {
return new Promise((resolve, reject) => {
$.ajax({
type: "POST",
url: url('auth/logout'),
dataType: "json",
success: (json) => resolve(json),
error: (json) => {
showAjaxError(json);
reject(json);
}
});
});
return Promise.resolve($.ajax({
type: "POST",
url: url('auth/logout'),
dataType: "json"
}));
}
$('#logout-button').click(() => confirmLogout());

106
resources/assets/src/scripts/user.js
View File

@ -2,7 +2,7 @@
* @Author: printempw
* @Date: 2016-07-16 10:02:24
* @Last Modified by: g-plane
* @Last Modified time: 2017-04-27 00:01:38
* @Last Modified time: 2017-04-27 16:37:05
*/
'use strict';
@ -538,49 +538,46 @@ function changeNickName() {
}
function changePassword() {
let domOldPwd = $('#password');
let domNewPwd = $('#new-passwd');
let domConfirmPwd = $('#confirm-pwd');
var password = $('#password').val();
var new_passwd = $('#new-passwd').val();
let password = domOldPwd.val();
let new_passwd = domNewPwd.val();
if (password == "") {
toastr.info(trans('user.emptyPassword'));
$('#passwd').focus();
domOldPwd.focus();
} else if (new_passwd == "") {
toastr.info(trans('user.emptyNewPassword'));
$('#new-passwd').focus();
} else if ($('#confirm-pwd').val() == "") {
domNewPwd.focus();
} else if (domConfirmPwd.val() == "") {
toastr.info(trans('auth.emptyConfirmPwd'));
$('#confirm-pwd').focus();
} else if (new_passwd != $('#confirm-pwd').val()) {
domConfirmPwd.focus();
} else if (new_passwd != domConfirmPwd.val()) {
toastr.warning(trans('auth.invalidConfirmPwd'));
$('#confirm-pwd').focus();
domConfirmPwd.focus();
} else {
$.ajax({
Promise.resolve($.ajax({
type: "POST",
url: "./profile?action=password",
dataType: "json",
data: { 'current_password': password, 'new_password': new_passwd},
success: function(json) {
if (json.errno == 0) {
swal({
type: 'success',
html: json.msg
}).then(function() {
logout(true, function() {
window.location = "../auth/login";
});
});
} else {
swal({
type: 'warning',
html: json.msg
});
}
},
error: showAjaxError
});
data: { 'current_password': password, 'new_password': new_passwd }
})).then(result => {
if (result.errno == 0) {
return swal({ type: 'success', text: result.msg })
.then(() => {
return logout();
}).then(result => {
if (result.errno == 0) {
window.location = url('auth/login');
}
}).catch(error => showAjaxError);
} else {
return swal({ type: 'warning', text: result.msg });
}
}).catch(error => showAjaxError);
}
return false;
}
$('#new-email').focusin(function() {
@ -614,32 +611,27 @@ function changeEmail() {
text: trans('user.changeEmail', { new_email: new_email }),
type: 'question',
showCancelButton: true
}).then(function() {
$.ajax({
type: "POST",
url: "./profile?action=email",
dataType: "json",
data: { 'new_email' : new_email, 'password' : $('#current-password').val() },
success: function(json) {
if (json.errno == 0) {
swal({
type: 'success',
html: json.msg
}).then(function() {
logout(true, function() {
window.location = "../auth/login";
});
});
} else {
swal({
type: 'warning',
html: json.msg
});
}
},
error: showAjaxError
});
});
}).then(() => {
return Promise.resolve($.ajax({
type: 'POST',
url: './profile?action=email',
dataType: 'json',
data: { 'new_email': new_email, 'password': $('#current-password').val() }
}));
}).then(result => {
if (result.errno == 0) {
return swal({ type: 'success', text: result.msg })
.then(() => {
return logout();
}).then(result => {
if (result.errno == 0) {
window.location = url('auth/login');
}
}).catch(error => showAjaxError);
} else {
return swal({ type: 'warning', text: result.msg });
}
}).catch(error => showAjaxError);
}
function deleteAccount() {