Fixed Error handling of REST API calls.

ManageIQ · Feb 27, 2017 · 04a2c53 · 04a2c53
1 parent ef884b3
commit 04a2c53
Showing 1 changed file with 24 additions and 10 deletions.
diff --git a/app/assets/javascripts/services/post_service.js b/app/assets/javascripts/services/post_service.js
@@ -6,18 +6,25 @@ ManageIQ.angular.app.service('postService', ["miqService", "$timeout", "$window"
       angular.toJson({
         action: "edit",
         resource: updateObject
-      })).then(handleSuccess, handleFailure);
+      })).then(function(response) {
+        if (response.error) {
+          handleFailure(response);
+        } else {
+          handleSuccess;
+        }
+      });
 
-    function handleSuccess(response) {
+    function handleSuccess() {
       $timeout(function () {
         $window.location.href = redirectURL + '&flash_msg=' + successMsg;
       });
     }
 
     function handleFailure(response) {
-      var msg = sprintf(__("Error during Save: [%s - %s]"), response.status, response.responseText);
-      $timeout(function () {
-        $window.location.href = redirectURL + '&flash_msg=' + msg + '&flash_error=true';
+      var msg = sprintf(__('Error during Save: [%s - %s]'), response.error.klass, response.error.message);
+      $timeout(function() {
+        miqService.sparkleOff();
+        miqService.miqFlash('error', __(msg));
       });
     }
   };
@@ -28,18 +35,25 @@ ManageIQ.angular.app.service('postService', ["miqService", "$timeout", "$window"
       angular.toJson({
         action: "create",
         resource: createObject
-      })).then(handleSuccess, handleFailure);
+      })).then(function(response) {
+        if (response.error) {
+          handleFailure(response);
+        } else {
+          handleSuccess;
+        }
+      });
 
-    function handleSuccess(response) {
+    function handleSuccess() {
       $timeout(function () {
         $window.location.href = redirectURL + '&flash_msg=' + successMsg;
       });
     }
 
     function handleFailure(response) {
-      var msg = sprintf(__("Error during Add: [%s - %s]"), response.status, response.responseText);
-      $timeout(function () {
-        $window.location.href = redirectURL + '&flash_msg=' + msg + '&flash_error=true';
+      var msg = sprintf(__('Error during Add: [%s - %s]'), response.error.klass, response.error.message);
+      $timeout(function() {
+        miqService.sparkleOff();
+        miqService.miqFlash('error', __(msg));
       });
     }
   };