Merge pull request #3393 from nimrodshn/better_handling_of_responses

Better handling of responses from validation
ManageIQ · Feb 19, 2018 · 6c8e07a · 6c8e07a
2 parents bed7f58 + aed0ceb
commit 6c8e07a
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js b/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
@@ -610,17 +610,23 @@ ManageIQ.angular.app.controller('emsCommonFormController', ['$http', '$scope', '
     $scope.authType = authType;
     miqService.validateWithREST($event, authType, $scope.actionUrl, formSubmit)
       .then(function success(data) {
-        $timeout(function() {
-          $scope.$apply(function() {
-            if(data.level == "error") {
-              $scope.updateAuthStatus(false);
-            } else {
-              $scope.updateAuthStatus(true);
-            }
-            miqService.miqFlash(data.level, data.message, data.options);
-            miqSparkleOff();
+        // check if data object is a JSON, otherwise (recieved JS or HTML) output a warning to the user.
+        if (data === Object(data)) {
+          $timeout(function() {
+            $scope.$apply(function() {
+              if(data.level == "error") {
+                $scope.updateAuthStatus(false);
+              } else {
+                $scope.updateAuthStatus(true);
+              }
+              miqService.miqFlash(data.level, data.message, data.options);
+              miqSparkleOff();
+            });
           });
-        });
+        } else {
+          miqService.miqFlash("error", __('Something went wrong, please check the logs for more information.'));
+          miqSparkleOff();
+        }
       });
   };