diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html index 1f19e16a1..c438faf4f 100644 --- a/webadmin/src/views/settings.html +++ b/webadmin/src/views/settings.html @@ -362,15 +362,20 @@ -

-
+
-
Backup in progress
+
{{ createBackup.percent }}%
+
-
+
+
+
+

{{ createBackup.message }}

+
+
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js index eb25cb7a5..4d015a100 100644 --- a/webadmin/src/views/settings.js +++ b/webadmin/src/views/settings.js @@ -100,11 +100,13 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca $scope.createBackup = { busy: false, percent: 100, + message: '', errorMessage: '', doCreateBackup: function () { $scope.createBackup.busy = true; $scope.createBackup.percent = 0; + $scope.createBackup.message = ''; $scope.createBackup.errorMessage = ''; Client.backup(function (error) { @@ -131,12 +133,15 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca // 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 - fetchBackups(); + $scope.createBackup.busy = false; - return; + $scope.createBackup.message = ''; + + return fetchBackups(); } $scope.createBackup.percent = data.backup.percent; + $scope.createBackup.message = data.backup.message; window.setTimeout(checkIfDone, 250); }); }