jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use the new task API

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-11-19 17:34:14 -08:00
parent 42e4588e9c
commit 85e467581c
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/backups.js
+8 -8
View File
@@ -89,26 +89,26 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
result: '',
updateStatus: function () {
Client.progress(function (error, data) {
Client.getTaskProgress('backup', function (error, data) {
if (error) return window.setTimeout($scope.createBackup.updateStatus, 250);
// check if we are done
if (!data.backup || data.backup.percent >= 100) {
if (data.backup && data.backup.message) console.error('Backup message: ' + data.backup.message); // backup error message
if (data.percent >= 100) {
if (data.message) console.error('Backup message: ' + data.message); // backup error message
$scope.createBackup.busy = false;
$scope.createBackup.message = '';
$scope.createBackup.detail = '';
$scope.createBackup.percent = 100; // indicates that 'result' is valid
$scope.createBackup.result = data.backup ? data.backup.message : null;
$scope.createBackup.result = data.result;
return fetchBackups();
}
$scope.createBackup.busy = true;
$scope.createBackup.percent = data.backup.percent;
$scope.createBackup.message = data.backup.message;
$scope.createBackup.detail = data.backup.detail;
$scope.createBackup.percent = data.percent;
$scope.createBackup.message = data.message;
$scope.createBackup.detail = data.detail;
window.setTimeout($scope.createBackup.updateStatus, 500);
});
},
@@ -143,7 +143,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
},
stopBackup: function () {
Client.stopBackup(function (error) {
Client.stopTask('backup', function (error) {
if (error) {
if (error.statusCode === 409) {
$scope.createBackup.errorMessage = 'No backup is currently in progress';