apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7448: zone tree - network - only show "public network" in middle menu when zone is in advanced-mode.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-08 16:21:21 -08:00
parent 8ea2959f71
commit c7ed0cf134
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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