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

Distinguish between app task and backup in progress

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-19 17:08:18 +01:00
parent f5c6862627
commit 70e861b106
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,11 +109,13 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
Client.backup(function (error) {
if (error) {
if (error.statusCode === 409) {
if (error.statusCode === 409 && error.message.indexOf('full_backup') !== -1) {
$scope.createBackup.errorMessage = 'Backup already in progress. Please retry later.';
} else if (error.statusCode === 409) {
$scope.createBackup.errorMessage = 'App task is currently in progress. Please retry later.';
} else {
$scope.createBackup.errorMessage = error.message;
console.error(error);
$scope.createBackup.errorMessage = error.message;
}
$scope.createBackup.busy = false;