merging stuff

ManageIQ · Aug 31, 2017 · 59cfd30 · 59cfd30
1 parent 6cdd539
commit 59cfd30
Showing 1 changed file with 9 additions and 8 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
@@ -266,9 +266,9 @@ ManageIQ.angular.app.controller('emsCommonFormController', ['$http', '$scope', '
       ($scope.emsCommonModel.default_password != '' && $scope.angularForm.default_password.$valid)) {
       return true;
     } else if (($scope.currentTab == "alerts" && $scope.emsCommonModel.ems_controller == "ems_container") &&
-        ($scope.emsCommonModel.emstype) &&
-        ($scope.emsCommonModel.prometheus_alerts_hostname != '' && $scope.emsCommonModel.prometheus_alerts_api_port != '') &&
-        ($scope.emsCommonModel.default_password != '' && $scope.angularForm.default_password.$valid)) {
+      ($scope.emsCommonModel.emstype) &&
+      ($scope.emsCommonModel.prometheus_alerts_hostname != '' && $scope.emsCommonModel.prometheus_alerts_api_port != '') &&
+      ($scope.emsCommonModel.default_password != '' && $scope.angularForm.default_password.$valid)) {
       return true;
     } else if(($scope.currentTab == "metrics" && $scope.emsCommonModel.ems_controller == "ems_container") &&
       ($scope.emsCommonModel.emstype) &&
@@ -459,11 +459,12 @@ ManageIQ.angular.app.controller('emsCommonFormController', ['$http', '$scope', '
 
   $scope.postValidationModelRegistry = function(prefix) {
     if ($scope.postValidationModel === undefined) {
-      $scope.postValidationModel = {default: {},
-                                    amqp: {},
-                                    metrics: {},
-                                    ssh_keypair: {},
-                                    prometheus_alerts: {}
+      $scope.postValidationModel = {
+        default: {},
+        amqp: {},
+        metrics: {},
+        ssh_keypair: {},
+        prometheus_alerts: {}
       }
     }
     if (prefix === "default") {