diff --git a/module/backup/control.php b/module/backup/control.php index 1c6164f9f3..3bdbbf7690 100644 --- a/module/backup/control.php +++ b/module/backup/control.php @@ -185,7 +185,7 @@ class backup extends control if($result['result'] == 'success') { $backupName = $result['data']->backup_name; - $this->send($result + array('callback' => "backupInProcess('$backupName')")); + $this->send($result + array('callback' => "backupInProgress('$backupName')")); } else { diff --git a/module/backup/js/index.ui.js b/module/backup/js/index.ui.js index 400c6ac77e..4b9230a468 100644 --- a/module/backup/js/index.ui.js +++ b/module/backup/js/index.ui.js @@ -113,7 +113,7 @@ $(document).off('click', '.modal [z-key="confirm"]').on('click', '.modal [z-key= if(deleting) $('#main').addClass('loading'); }); -window.backupInProcess = function(backupName) +window.backupInProgress = function(backupName) { if(!inQuickon) return false; @@ -132,7 +132,7 @@ window.backupInProcess = function(backupName) }, 2000); }; -window.restoreInProcess = function(backupName) +window.restoreInProgress = function(backupName) { if(!inQuickon) return false; @@ -152,7 +152,7 @@ window.restoreInProcess = function(backupName) }, 2000); }; -window.deleteInProcess = function(backupName) +window.deleteInProgress = function(backupName) { if(!inQuickon) return false; diff --git a/module/system/control.php b/module/system/control.php index 4d4aaa007a..d732159a91 100644 --- a/module/system/control.php +++ b/module/system/control.php @@ -247,7 +247,7 @@ class system extends control if($result['result'] == 'success') { $backupName = $result['data']->backup_name; - $this->send($result + array('callback' => "backupInProcess('$backupName')")); + $this->send($result + array('callback' => "backupInProgress('$backupName')")); } else { @@ -287,7 +287,7 @@ class system extends control $this->loadModel('action')->create('system', 0, 'restoreBackup', '', $backupName); - $this->send($result + array('load' => true, 'callback' => "restoreInProcess('$backupName')")); + $this->send($result + array('load' => true, 'callback' => "restoreInProgress('$backupName')")); } /** @@ -306,7 +306,7 @@ class system extends control $this->loadModel('action')->create('system', 0, 'deleteBackup', '', $backupName); - $this->send($result + array('load' => true, 'callback' => "deleteInProcess('$backupName')")); + $this->send($result + array('load' => true, 'callback' => "deleteInProgress('$backupName')")); } /**