etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7649: physical resource - zone - network - 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.

This commit is contained in:
Jessica Wang 2010-12-22 18:12:07 -08:00
parent 5a0fa3380d
commit 7ef2debef6
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui/scripts/cloud.core.network.js
View File

@ -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) ******************************************************************************************************