diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index f351787011d..655d86942d5 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -86,26 +86,25 @@ function networkPopulateMiddleMenu($leftmenuItem1) { //direct network listMidMenuItems2(("listNetworks&type=Direct&zoneId="+zoneObj.id), networkGetSearchParams, "listnetworksresponse", "network", directNetworkToMidmenu, directNetworkToRightPanel, directNetworkGetMidmenuId, false, 1); - //public network - 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.prepend($midmenuItem1.show()); //prepend public network on the top of middle menu - $midmenuItem1.click(); - } + //public network + $midmenuContainer.find("#midmenu_container_no_items_available").remove(); //There is always at least one item (i.e. public network) in middle menu. So, "no items available" shouldn't be in middle menu even there is zero direct network item in middle menu. + $.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.prepend($midmenuItem1.show()); //prepend public network on the top of middle menu + $midmenuItem1.click(); } - }); - } + } + }); } //***** Public Network (begin) ******************************************************************************************************