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

Use data.success before grabbing the error

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-08-30 14:24:59 -07:00
parent 42399469a7
commit e30698459b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/backups.js
View File

@@ -127,7 +127,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat
$scope.createBackup.busy = false;
$scope.createBackup.message = '';
$scope.createBackup.percent = 100; // indicates that 'result' is valid
$scope.createBackup.errorMessage = data.errorMessage;
$scope.createBackup.errorMessage = data.success ? '' : data.error.message;
return fetchBackups();
}

4
src/views/domains.js
View File

@@ -342,7 +342,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
$scope.renewCerts.busy = false;
$scope.renewCerts.message = '';
$scope.renewCerts.percent = 100; // indicates that 'result' is valid
$scope.renewCerts.errorMessage = data.errorMessage;
$scope.renewCerts.errorMessage = data.success ? '' : data.error.message;
return;
}
@@ -453,7 +453,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat
$scope.changeDashboard.busy = false;
$scope.changeDashboard.message = '';
$scope.changeDashboard.percent = 100; // indicates that 'result' is valid
$scope.changeDashboard.errorMessage = data.errorMessage;
$scope.changeDashboard.errorMessage = data.success ? '' : data.error.message;
if (!$scope.changeDashboard.errorMessage) $scope.changeDashboard.setDashboardDomain();

2
src/views/settings.js
View File

@@ -84,7 +84,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.update.busy = false;
$scope.update.message = '';
$scope.update.percent = 100; // indicates that 'result' is valid
$scope.update.errorMessage = data.errorMessage;
$scope.update.errorMessage = data.success ? '' : data.error.message;
if (!data.errorMessage) $scope.update.reloadIfNeeded(); // assume success