From e30698459b71fb0ea8293344b0ca669cbb447e96 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 30 Aug 2019 14:24:59 -0700
Subject: [PATCH] Use data.success before grabbing the error

---
 src/views/backups.js  | 2 +-
 src/views/domains.js  | 4 ++--
 src/views/settings.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/backups.js b/src/views/backups.js
index cb63f4f3f..9a0fd11e5 100644
--- a/src/views/backups.js
+++ b/src/views/backups.js
@@ -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();
                 }
diff --git a/src/views/domains.js b/src/views/domains.js
index c07b64d46..1c9af4bc0 100644
--- a/src/views/domains.js
+++ b/src/views/domains.js
@@ -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();
 
diff --git a/src/views/settings.js b/src/views/settings.js
index e42a72644..65ffd3a05 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -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