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

Show the detailed backup progress during update

Browse Source 
Fixes #157
This commit is contained in:
Johannes Zellner
2017-01-12 13:42:55 +01:00
parent aa4d95f352
commit 1c9f2495e3
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webadmin/src/js/update.js
View File

@@ -25,9 +25,15 @@ app.controller('Controller', ['$scope', '$http', '$interval', function ($scope,
$scope.error = true;
$scope.message = data.update.message;
} else {
$scope.title = 'Update in progress...';
$scope.percent = data.update.percent;
$scope.message = data.update.message;
if (data.backup && data.backup.percent < 100) {
$scope.title = 'Backup in progress...';
$scope.percent = (data.backup.percent / 100) * 50;
$scope.message = data.backup.message;
} else {
$scope.title = 'Update in progress...';
$scope.percent = 50 + ((data.update.percent / 100) * 50); // first half is backup
$scope.message = data.update.message;
}
}
} else { // migrating
if (data.migrate.percent === -1) {
@@ -55,7 +61,7 @@ app.controller('Controller', ['$scope', '$http', '$interval', function ($scope,
});
}
$interval(fetchProgress, 5000);
$interval(fetchProgress, 2000);
fetchProgress();
}]);