Browse Source

AMBARI-11578. View instance creation should default to automatic mode. (alexantonenko)

Alex Antonenko 10 years ago
parent
commit
23604e3a19

+ 16 - 11
ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js

@@ -52,6 +52,7 @@ angular.module('ambariAdminConsole')
         description: '',
         description: '',
         isLocalCluster: false
         isLocalCluster: false
       };
       };
+      loadClusters();
     });
     });
   }
   }
 
 
@@ -91,17 +92,21 @@ angular.module('ambariAdminConsole')
   $scope.numberOfClusterConfigs = 0;
   $scope.numberOfClusterConfigs = 0;
   $scope.numberOfSettingConfigs = 0;
   $scope.numberOfSettingConfigs = 0;
 
 
-  Cluster.getAllClusters().then(function (clusters) {
-    if(clusters.length >0){
-      clusters.forEach(function(cluster) {
-        $scope.clusters.push(cluster.Clusters.cluster_name)
-      });
-      $scope.noClusterAvailible = false;
-    }else{
-      $scope.clusters.push("No Clusters");
-    }
-    $scope.cluster = $scope.clusters[0];
-  });
+  function loadClusters () {
+    Cluster.getAllClusters().then(function (clusters) {
+      if(clusters.length >0){
+        clusters.forEach(function(cluster) {
+          $scope.clusters.push(cluster.Clusters.cluster_name)
+        });
+        $scope.noClusterAvailible = false;
+        $scope.instance.isLocalCluster = $scope.clusterConfigurable;
+      }else{
+        $scope.clusters.push("No Clusters");
+      }
+      $scope.cluster = $scope.clusters[0];
+    });
+  }
+
 
 
   $scope.versions = [];
   $scope.versions = [];
   $scope.version = null;
   $scope.version = null;