From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 27 七月 2023 17:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js | 72 ++++-------------------------------
1 files changed, 9 insertions(+), 63 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js
index 5052a25..86ff061 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/userActivity/userActivity.js
@@ -106,13 +106,7 @@
UserActivity.check = function (type) {
var selected = $('#' + this.id).bootstrapTable('getSelections');
if(selected.length == 0){
- if(language==1){
- Feng.info("请先选中表格中的某一记录！");
- }else if(language==2){
- Feng.info("Please select a record in the table first！");
- }else {
- Feng.info("Pilih catatan di tabel terlebih dahulu！");
- }
+ Feng.info("请先选中表格中的某一记录！");
return false;
}else{
@@ -121,42 +115,18 @@
UserActivity.seItem = selected[0];
return true;
}else if(type==3 && selected[0].status!=3 && selected[0].status!=4){
- if(language==1){
- Feng.info("当前状态不能暂停/启动！");
- }else if(language==2){
- Feng.info("The current state cannot be suspended/ started!");
- }else {
- Feng.info("Keadaan saat ini tidak dapat ditangguhkan/ dimulai!");
- }
+ Feng.info("当前状态不能暂停/启动！");
return false;
}else if(type==3 && selected[0].status==3 && (selected[0].startTime>new Date() || new Date()>selected[0].endTime)){
- if(language==1){
- Feng.info("当前状态不能暂停/启动！");
- }else if(language==2){
- Feng.info("The current state cannot be suspended/ started!");
- }else {
- Feng.info("Keadaan saat ini tidak dapat ditangguhkan/ dimulai!");
- }
+ Feng.info("当前状态不能暂停/启动！");
return false;
}else if(type==1 && selected[0].status!=1){
- if(language==1){
- Feng.info("当前状态不能审核！");
- }else if(language==2){
- Feng.info("The current status cannot be audited！");
- }else {
- Feng.info("Status saat ini tidak dapat diaudisikan！");
- }
+ Feng.info("当前状态不能审核！");
return false;
}else if(type==2 && selected[0].status!=2){
- if(language==1){
- Feng.info("当前状态不能编辑！");
- }else if(language==2){
- Feng.info("The current status cannot be edited！");
- }else {
- Feng.info("Status saat ini tidak dapat diedit！");
- }
+ Feng.info("当前状态不能编辑！");
return false;
}
@@ -230,22 +200,10 @@
UserActivity.delete = function () {
if (this.check()) {
var ajax = new $ax(Feng.ctxPath + "/userActivity/delete", function (data) {
- if(language==1){
- Feng.success("删除成功!");
- }else if(language==2){
- Feng.success("Delete succeeded!");
- }else {
- Feng.success("Hapus berhasil!");
- }
+ Feng.success("删除成功!");
UserActivity.table.refresh();
}, function (data) {
- if(language==1){
- Feng.error("删除失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Delete failed!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
- }
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
});
ajax.set("userActivityId",this.seItem.id);
ajax.start();
@@ -257,23 +215,11 @@
UserActivity.updateStatus = function () {
if (this.check(3)) {
var ajax = new $ax(Feng.ctxPath + "/userActivity/updateStatus", function (data) {
- if(language==1){
- Feng.success("启动/暂停成功!");
- }else if(language==2){
- Feng.success("Start/pause successfully!");
- }else {
- Feng.success("Mulai/berhenti dengan sukses!");
- }
+ Feng.success("启动/暂停成功!");
UserActivity.table.refresh();
}, function (data) {
- if(language==1){
- Feng.success("启动/暂停失败!");
- }else if(language==2){
- Feng.success("Failed to start/pause!");
- }else {
- Feng.success("Gagal memulai/berhenti!");
- }
+ Feng.success("启动/暂停失败!");
});
ajax.set("id",this.seItem.id);
--
Gitblit v1.7.1