From 6f29c20599b7ba1c511b499d55d3a253240f99fd Mon Sep 17 00:00:00 2001 From: Harpreet Kataria Date: Sun, 26 Feb 2017 09:02:20 -0500 Subject: [PATCH] Fixed Error handling of REST API calls. --- .../javascripts/services/post_service.js | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/services/post_service.js b/app/assets/javascripts/services/post_service.js index d0b2e884e83..9ef1824f599 100644 --- 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)); }); } };