提交 cb993369 编写于 作者: Y Yiming Liu

Merge pull request #132 from lepdou/lepdou_master

如果环境下面只有一个default集群,则不展示集群列表
...@@ -6,7 +6,7 @@ application_module.controller("AppConfigController", ...@@ -6,7 +6,7 @@ application_module.controller("AppConfigController",
var currentUser = 'test_user'; var currentUser = 'test_user';
var pageContext = { var pageContext = {
appId: appId, appId: appId,
env: 'LOCAL', env: '',
clusterName: 'default' clusterName: 'default'
}; };
...@@ -21,19 +21,23 @@ application_module.controller("AppConfigController", ...@@ -21,19 +21,23 @@ application_module.controller("AppConfigController",
var node = {}; var node = {};
//first nav //first nav
node.text = item.env; node.text = item.env;
node.selectable = false;
//second nav
var clusterNodes = []; var clusterNodes = [];
item.clusters.forEach(function (item) { //如果env下面只有一个default集群则不显示集群列表
var clusterNode = {}, if (item.clusters && item.clusters.length == 1 && item.clusters[0].name == 'default'){
parentNode = []; node.selectable = true;
}else {
clusterNode.text = item.name; node.selectable = false;
parentNode.push(node.text); //second nav
clusterNode.tags = parentNode; item.clusters.forEach(function (item) {
clusterNodes.push(clusterNode); var clusterNode = {},
}); parentNode = [];
clusterNode.text = item.name;
parentNode.push(node.text);
clusterNode.tags = parentNode;
clusterNodes.push(clusterNode);
});
}
node.nodes = clusterNodes; node.nodes = clusterNodes;
navTree.push(node); navTree.push(node);
}); });
...@@ -43,8 +47,13 @@ application_module.controller("AppConfigController", ...@@ -43,8 +47,13 @@ application_module.controller("AppConfigController",
data: navTree, data: navTree,
levels: 99, levels: 99,
onNodeSelected: function (event, data) { onNodeSelected: function (event, data) {
$scope.pageContext.env = data.tags[0]; if (!data.tags){//first nav node
$scope.pageContext.clusterName = data.text; $scope.pageContext.env = data.text;
$scope.pageContext.clusterName = 'default';
}else {//second cluster node
$scope.pageContext.env = data.tags[0];
$scope.pageContext.clusterName = data.text;
}
refreshNamespaces(); refreshNamespaces();
} }
}); });
...@@ -63,6 +72,9 @@ application_module.controller("AppConfigController", ...@@ -63,6 +72,9 @@ application_module.controller("AppConfigController",
refreshNamespaces(); refreshNamespaces();
function refreshNamespaces(viewType) { function refreshNamespaces(viewType) {
if ($scope.pageContext.env == ''){
return;
}
ConfigService.load_all_namespaces($scope.pageContext.appId, $scope.pageContext.env, ConfigService.load_all_namespaces($scope.pageContext.appId, $scope.pageContext.env,
$scope.pageContext.clusterName, viewType).then( $scope.pageContext.clusterName, viewType).then(
function (result) { function (result) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册