From 23b17b21b7144af85b02a68c8a46eaafd47c5065 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 6 Jun 2024 15:13:29 +0800
Subject: [PATCH]  * [tassk#116512,doing,0.3h] adjust process for origin
 backup.

---
 module/backup/js/index.ui.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/module/backup/js/index.ui.js b/module/backup/js/index.ui.js
index 3c6610df7c..8c9b4c8d18 100644
--- a/module/backup/js/index.ui.js
+++ b/module/backup/js/index.ui.js
@@ -116,13 +116,16 @@ $(document).off('click', '.modal [z-key="confirm"]').on('click', '.modal [z-key=
 window.backupInProcess = function(backupName)
 {
     if(!inQuickon) return false;
+
+    $('.origin-action').attr('disabled', 'disabled');
+    loadTable();
     let intervalId = setInterval(function()
     {
-        $.get($.createLink('system', 'ajaxGetBackupProgress', 'backupName=' + backupName.replace('-', '_')), function(resp)
+        $.get($.createLink('system', 'ajaxGetBackupProgress', 'backupName=' + backupName.replace(/-/g, '_')), function(resp)
         {
-            if(resp.status == 'completed')
+            if(resp.status == 'completed' || resp.status.toLowerCase().includes('failed'))
             {
-                $.apps.reloadApp('admin');
+                loadCurrentPage();
                 clearInterval(intervalId);
             }
         }, 'json');
@@ -132,13 +135,16 @@ window.backupInProcess = function(backupName)
 window.restoreInProcess = function(backupName)
 {
     if(!inQuickon) return false;
+
+    $('.origin-action').attr('disabled', 'disabled');
+    loadTable();
     let intervalId = setInterval(function()
     {
         $.get($.createLink('system', 'ajaxGetRestoreProgress', 'backupName=' + backupName.replace(/-/g, '_')), function(resp)
         {
-            if(resp.status == 'completed')
+            if(resp.status == 'completed' || resp.status.toLowerCase().includes('failed'))
             {
-                $.apps.reloadApp('admin');
+                loadCurrentPage();
                 clearInterval(intervalId);
             }
         }, 'json');
@@ -149,14 +155,16 @@ window.restoreInProcess = function(backupName)
 window.deleteInProcess = function(backupName)
 {
     if(!inQuickon) return false;
+
+    loadTable();
     let intervalId = setInterval(function()
     {
 
-        $.get($.createLink('system', 'ajaxGetDeleteProgress', 'backupName=' + backupName.replace('-', '_')), function(resp)
+        $.get($.createLink('system', 'ajaxGetDeleteProgress', 'backupName=' + backupName.replace(/-/g, '_')), function(resp)
         {
-            if(resp.status == 'completed')
+            if(resp.status == 'completed' || resp.status.toLowerCase().includes('failed'))
             {
-                $.apps.reloadApp('admin');
+                loadCurrentPage();
                 clearInterval(intervalId);
             }
         }, 'json');