From 35dbdef1514594cd6d960de37ea314cb7433b70f Mon Sep 17 00:00:00 2001
From: zhaixiaojian <zhaixiaojian@easycorp.ltd>
Date: Mon, 25 Nov 2024 10:10:38 +0800
Subject: [PATCH] [task#69672,done,2h,0h] Optimize deletion prompts and logic.

---
 module/instance/control.php            | 4 +---
 module/instance/lang/de.php            | 4 ++--
 module/instance/lang/en.php            | 2 +-
 module/instance/lang/fr.php            | 4 ++--
 module/instance/lang/zh-cn.php         | 2 +-
 module/instance/ui/backuplist.html.php | 3 +--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/module/instance/control.php b/module/instance/control.php
index 4f698f65a0..40b1a9e582 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -667,9 +667,7 @@ class instance extends control
 
         $success = $this->instance->deleteBackup($instance, $backupName);
         if(!$success) return $this->send(array('result' => 'fail', 'message' => zget($this->lang->instance->notices, 'deleteFail')));
-
         $this->action->create('instance', $instance->id, 'manualdeletebackup', '', json_encode(array('result' => 'success')));
-        $locate = $this->createLink('instance', 'view', 'id=' . $instanceID);
-        return $this->send(array('result' => 'success', 'load' => array('alert' => zget($this->lang->instance->notices, 'deleteSuccess'), 'locate' => $locate, 'closeModal' => true)));
+        return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'deleteSuccess'), 'load' => $this->createLink('instance', 'view', 'id=' . $instanceID)));
     }
 }
diff --git a/module/instance/lang/de.php b/module/instance/lang/de.php
index fa85304569..a2c69001df 100644
--- a/module/instance/lang/de.php
+++ b/module/instance/lang/de.php
@@ -117,7 +117,7 @@ $lang->instance->backup->volSpentSeconds     = 'Time taken (seconds)';
 $lang->instance->backup->volSize             = 'Size';
 $lang->instance->backup->lastRestore         = 'Last rollback';
 $lang->instance->backup->restoreDate         = 'Restore time';
-$lang->instance->backup->latestBackupAt        = 'Last backup time';
+$lang->instance->backup->latestBackupAt      = 'Last backup time';
 $lang->instance->backup->backupBeforeRestore = 'We recommend that you backup before rolling back!';
 $lang->instance->backup->enableAutoBackup    = 'Enable automatic backup';
 $lang->instance->backup->autoBackup          = 'Automatic backup';
@@ -293,7 +293,7 @@ $lang->instance->notices['backupFail']               = 'Backup failed';
 $lang->instance->notices['cleanBackupsSuccess']      = 'Backup cleanup successfuls';
 $lang->instance->notices['restoreSuccess']           = 'The rollback task has been submitted';
 $lang->instance->notices['restoreFail']              = 'Rollback failed';
-$lang->instance->notices['deleteSuccess']            = 'DeleteSuccess';
+$lang->instance->notices['deleteSuccess']            = 'The deletion task has been submitted';
 $lang->instance->notices['deleteFail']               = 'Delete failed';
 $lang->instance->notices['starting']                 = 'Starting, please wait...';
 $lang->instance->notices['stopping']                 = 'Closing, please wait...';
diff --git a/module/instance/lang/en.php b/module/instance/lang/en.php
index fc4815035c..a2c69001df 100644
--- a/module/instance/lang/en.php
+++ b/module/instance/lang/en.php
@@ -293,7 +293,7 @@ $lang->instance->notices['backupFail']               = 'Backup failed';
 $lang->instance->notices['cleanBackupsSuccess']      = 'Backup cleanup successfuls';
 $lang->instance->notices['restoreSuccess']           = 'The rollback task has been submitted';
 $lang->instance->notices['restoreFail']              = 'Rollback failed';
-$lang->instance->notices['deleteSuccess']            = 'DeleteSuccess';
+$lang->instance->notices['deleteSuccess']            = 'The deletion task has been submitted';
 $lang->instance->notices['deleteFail']               = 'Delete failed';
 $lang->instance->notices['starting']                 = 'Starting, please wait...';
 $lang->instance->notices['stopping']                 = 'Closing, please wait...';
diff --git a/module/instance/lang/fr.php b/module/instance/lang/fr.php
index fa85304569..a2c69001df 100644
--- a/module/instance/lang/fr.php
+++ b/module/instance/lang/fr.php
@@ -117,7 +117,7 @@ $lang->instance->backup->volSpentSeconds     = 'Time taken (seconds)';
 $lang->instance->backup->volSize             = 'Size';
 $lang->instance->backup->lastRestore         = 'Last rollback';
 $lang->instance->backup->restoreDate         = 'Restore time';
-$lang->instance->backup->latestBackupAt        = 'Last backup time';
+$lang->instance->backup->latestBackupAt      = 'Last backup time';
 $lang->instance->backup->backupBeforeRestore = 'We recommend that you backup before rolling back!';
 $lang->instance->backup->enableAutoBackup    = 'Enable automatic backup';
 $lang->instance->backup->autoBackup          = 'Automatic backup';
@@ -293,7 +293,7 @@ $lang->instance->notices['backupFail']               = 'Backup failed';
 $lang->instance->notices['cleanBackupsSuccess']      = 'Backup cleanup successfuls';
 $lang->instance->notices['restoreSuccess']           = 'The rollback task has been submitted';
 $lang->instance->notices['restoreFail']              = 'Rollback failed';
-$lang->instance->notices['deleteSuccess']            = 'DeleteSuccess';
+$lang->instance->notices['deleteSuccess']            = 'The deletion task has been submitted';
 $lang->instance->notices['deleteFail']               = 'Delete failed';
 $lang->instance->notices['starting']                 = 'Starting, please wait...';
 $lang->instance->notices['stopping']                 = 'Closing, please wait...';
diff --git a/module/instance/lang/zh-cn.php b/module/instance/lang/zh-cn.php
index fdcad8fde8..f5217b709b 100644
--- a/module/instance/lang/zh-cn.php
+++ b/module/instance/lang/zh-cn.php
@@ -297,7 +297,7 @@ $lang->instance->notices['backupFail']               = '备份失败';
 $lang->instance->notices['cleanBackupsSuccess']       = '备份清理成功';
 $lang->instance->notices['restoreSuccess']           = '还原任务已提交';
 $lang->instance->notices['restoreFail']              = '还原失败';
-$lang->instance->notices['deleteSuccess']            = '删除成功';
+$lang->instance->notices['deleteSuccess']            = '删除任务已提交';
 $lang->instance->notices['deleteFail']               = '删除失败';
 $lang->instance->notices['starting']                 = '启动中，请稍候...';
 $lang->instance->notices['stopping']                 = '关闭中，请稍候...';
diff --git a/module/instance/ui/backuplist.html.php b/module/instance/ui/backuplist.html.php
index c9983bcfaf..c80fc7ff1c 100644
--- a/module/instance/ui/backuplist.html.php
+++ b/module/instance/ui/backuplist.html.php
@@ -45,10 +45,9 @@ foreach($backupList as &$backup)
     foreach($config->backup->dtable->fieldList['actions']['actionsMap'] as $actionType => $actionItems)
     {
         $backup->actions[$actionIdx]['name']     = $actionType;
-        $backup->actions[$actionIdx]['disabled'] = false;
+        $backup->actions[$actionIdx]['disabled'] = (!in_array($status, array('success', 'completed', 'deleting')) || (!empty($restoreStatus) && in_array($restoreStatus, array('pending', 'inprogress')))) ? true : false;
         $actionIdx++;
     }
-    if(!in_array($status, array('success', 'completed')) || in_array($restoreStatus, array('pending', 'inprogress')))  $backup->actions[0]['disabled'] = true;
 }
 dtable
 (