made changes to code to handle API Failure.

ManageIQ · Mar 5, 2017 · b36de98 · b36de98
1 parent 6f29c20
commit b36de98
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 33 deletions.
diff --git a/app/assets/javascripts/services/miq_service.js b/app/assets/javascripts/services/miq_service.js
@@ -124,7 +124,7 @@ ManageIQ.angular.app.service('miqService', ['$timeout', '$document', '$q', '$log
 
     return serializedObj;
   };
-  
+
   this.handleFailure = function(e) {
     miqSparkleOff();
     if (e.message) {

diff --git a/app/assets/javascripts/services/post_service.js b/app/assets/javascripts/services/post_service.js
@@ -6,26 +6,19 @@ ManageIQ.angular.app.service('postService', ["miqService", "$timeout", "$window"
       angular.toJson({
         action: "edit",
         resource: updateObject
-      })).then(function(response) {
+      })).then(handleSuccess)
+         .catch(miqService.handleFailure);
+
+    function handleSuccess(response) {
+      $timeout(function () {
         if (response.error) {
-          handleFailure(response);
+          var msg = __(response.error.klass + ': ' + response.error.message);
+          miqService.miqFlash('error', msg);
+          miqService.sparkleOff();
         } else {
-          handleSuccess;
+          $window.location.href = redirectURL + '&flash_msg=' + successMsg;
         }
       });
-
-    function handleSuccess() {
-      $timeout(function () {
-        $window.location.href = redirectURL + '&flash_msg=' + successMsg;
-      });
-    }
-
-    function handleFailure(response) {
-      var msg = sprintf(__('Error during Save: [%s - %s]'), response.error.klass, response.error.message);
-      $timeout(function() {
-        miqService.sparkleOff();
-        miqService.miqFlash('error', __(msg));
-      });
     }
   };
 
@@ -35,26 +28,19 @@ ManageIQ.angular.app.service('postService', ["miqService", "$timeout", "$window"
       angular.toJson({
         action: "create",
         resource: createObject
-      })).then(function(response) {
+      })).then(handleSuccess)
+         .catch(miqService.handleFailure);
+
+    function handleSuccess(response) {
+      $timeout(function () {
         if (response.error) {
-          handleFailure(response);
+          var msg = __(response.error.klass + ': ' + response.error.message);
+          miqService.miqFlash('error', msg);
+          miqService.sparkleOff();
         } else {
-          handleSuccess;
+          $window.location.href = redirectURL + '&flash_msg=' + successMsg;
         }
       });
-
-    function handleSuccess() {
-      $timeout(function () {
-        $window.location.href = redirectURL + '&flash_msg=' + successMsg;
-      });
-    }
-
-    function handleFailure(response) {
-      var msg = sprintf(__('Error during Add: [%s - %s]'), response.error.klass, response.error.message);
-      $timeout(function() {
-        miqService.sparkleOff();
-        miqService.miqFlash('error', __(msg));
-      });
     }
   };