From edf83149d0f26fb99eb6548d9e68bcc81a8cc893 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 13 十月 2023 17:03:37 +0800
Subject: [PATCH] 10.13bug2
---
cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js | 74 +++++--------------------------------
1 files changed, 10 insertions(+), 64 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js b/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js
index 0a0cf46..c81798b 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js
@@ -29,30 +29,22 @@
password: {
validators: {
notEmpty: {
- message: language==1?'密码不能为空':(language==2?"The password cannot be empty.":"Kata sandi tidak bisa kosong.")
- },
- identical: {
- field: 'rePassword',
- message: language==1?'两次密码不一致':(language==2?"The password entered twice are inconsistent.":"Kata sandi yang dimasukkan dua kali tidak konsisten.")
+ message: '密码不能为空'
},
regexp: {
regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: language==1?'密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符':(language==2?"The name cannot be empty. The password must contain letters, numbers, and special characters. At least 8 characters and at most 30 characters.":"Namanya tidak bisa kosong. Kata sandi harus mengandung huruf, nomor, dan karakter khusus. Setidaknya 8 karakter dan paling tidak 30 karakter.")
+ message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
},
}
},
rePassword: {
validators: {
notEmpty: {
- message: language==1?'密码不能为空':(language==2?"The password cannot be empty.":"Kata sandi tidak bisa kosong.")
- },
- identical: {
- field: 'password',
- message: language==1?'两次密码不一致':(language==2?"The password entered twice are inconsistent.":"Kata sandi yang dimasukkan dua kali tidak konsisten.")
+ message: '密码不能为空'
},
regexp: {
regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: language==1?'密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符':(language==2?"The name cannot be empty. The password must contain letters, numbers, and special characters. At least 8 characters and at most 30 characters.":"Namanya tidak bisa kosong. Kata sandi harus mengandung huruf, nomor, dan karakter khusus. Setidaknya 8 karakter dan paling tidak 30 karakter.")
+ message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
},
}
}
@@ -214,17 +206,7 @@
return;
}
- if (!this.validatePwd()) {
- if(language==1){
- Feng.error("两次密码输入不一致");
- }else if(language==2){
- Feng.error("The two password entries are inconsistent");
- }else {
- Feng.error("Dua entri kata sandi tidak konsisten");
- }
- return;
- }
var birthday = $("#birthday").val();
if ("" == birthday){
@@ -254,26 +236,14 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/mgr/add", function (data) {
- if(language==1){
- Feng.success("添加成功!");
- }else if(language==2){
- Feng.success("Successfully added!");
- }else {
- Feng.success("Sangat berhasil ditambah!");
- }
+ Feng.success("添加成功!");
window.parent.MgrUser.table.refresh();
UserInfoDlg.close();
$(".img-circle").each(function () {
$(this).attr("src",Feng.ctxPath+$("#avatar").val());
})
}, function (data) {
- if(language==1){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to add!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
- }
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.userInfoData);
ajax.start();
@@ -317,13 +287,7 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/mgr/edit", function (data) {
- if(language==1){
- Feng.success("修改成功!");
- }else if(language==2){
- Feng.success("Modify successfully!");
- }else {
- Feng.success("Mengubah dengan sukses!");
- }
+ Feng.success("修改成功!");
if (window.parent.MgrUser != undefined) {
window.parent.MgrUser.table.refresh();
UserInfoDlg.close();
@@ -334,13 +298,7 @@
window.parent.$("#userNameTab").text($("#name").val());
}, function (data) {
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(this.userInfoData);
ajax.start();
@@ -376,21 +334,9 @@
return
}
var ajax = new $ax(Feng.ctxPath + "/mgr/changePwd", function (data) {
- if(language==1){
- Feng.success("修改成功!");
- }else if(language==2){
- Feng.success("Modify successfully!");
- }else {
- Feng.success("Mengubah dengan sukses!");
- }
+ Feng.success("修改成功!");
}, function (data) {
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set("oldPwd");
ajax.set("newPwd");
--
Gitblit v1.7.1