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

Save backup logs and fix backup progress

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-09-26 16:31:08 -07:00
parent 2780de631e
commit 8d3fbc5432
10 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webadmin/src/views/settings.html
View File

@@ -379,7 +379,11 @@
</div>
<div class="row" ng-show="backupConfig.provider !== 'caas'">
<div class="col-md-6">
<p ng-show="createBackup.busy">{{ createBackup.message }}</p>
<p ng-show="createBackup.busy">{{ createBackup.message }} {{ createBackup.detail }}</p>
<p ng-hide="createBackup.busy">
<div class="has-error" ng-show="createBackup.percent === 100 && createBackup.result">{{ createBackup.result }}</div>
<div class="text-success" ng-show="createBackup.percent === 100 && !createBackup.result"><b>Backup Successful</b></div>
</p>
</div>
<div class="col-md-6 text-right">
<button class="btn btn-outline btn-primary pull-right" ng-click="configureBackup.show()" ng-disabled="createBackup.busy">Configure</button>

9
webadmin/src/views/settings.js
View File

@@ -117,14 +117,17 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.createBackup = {
busy: false,
percent: 100,
percent: 0,
message: '',
errorMessage: '',
result: '',
doCreateBackup: function () {
$scope.createBackup.busy = true;
$scope.createBackup.percent = 0;
$scope.createBackup.message = '';
$scope.createBackup.detail = '';
$scope.createBackup.result = '';
$scope.createBackup.errorMessage = '';
Client.backup(function (error) {
@@ -154,12 +157,16 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$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;
return fetchBackups();
}
$scope.createBackup.percent = data.backup.percent;
$scope.createBackup.message = data.backup.message;
$scope.createBackup.detail = data.backup.detail;
window.setTimeout(checkIfDone, 500);
});
}