From c7ed0cf1340ceed66a4e4e89f3862d9fb60f5150 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 8 Dec 2010 16:21:21 -0800 Subject: [PATCH] bug 7448: zone tree - network - only show "public network" in middle menu when zone is in advanced-mode. --- ui/scripts/cloud.core.network.js | 36 +++++++++++++++++--------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index 2e2723a172c..df26b29874c 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -40,24 +40,26 @@ function afterLoadNetworkJSP($leftmenuItem1) { //populate items into middle menu var $midmenuContainer = $("#midmenu_container").empty(); - - $.ajax({ - data: createURL("command=listNetworks&isSystem=true&zoneId="+zoneObj.id), - dataType: "json", - async: false, - success: function(json) { - var items = json.listnetworksresponse.network; - if(items != null && items.length > 0) { - var item = items[0]; - var $midmenuItem1 = $("#midmenu_item").clone(); - $midmenuItem1.data("toRightPanelFn", publicNetworkToRightPanel); - publicNetworkToMidmenu(item, $midmenuItem1); - bindClickToMidMenu($midmenuItem1, publicNetworkToRightPanel, publicNetworkGetMidmenuId); - $midmenuContainer.append($midmenuItem1.show()); - $midmenuItem1.click(); + + if(zoneObj.networktype == "Advanced") { + $.ajax({ + data: createURL("command=listNetworks&isSystem=true&zoneId="+zoneObj.id), + dataType: "json", + async: false, + success: function(json) { + var items = json.listnetworksresponse.network; + if(items != null && items.length > 0) { + var item = items[0]; + var $midmenuItem1 = $("#midmenu_item").clone(); + $midmenuItem1.data("toRightPanelFn", publicNetworkToRightPanel); + publicNetworkToMidmenu(item, $midmenuItem1); + bindClickToMidMenu($midmenuItem1, publicNetworkToRightPanel, publicNetworkGetMidmenuId); + $midmenuContainer.append($midmenuItem1.show()); + $midmenuItem1.click(); + } } - } - }); + }); + } $.ajax({ data: createURL("command=listNetworks&type=Direct&zoneId="+zoneObj.id),