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

CLOUDSTACK-7896: UI > network > Add Guest Network > when zone dropdown is empty, do not make API call to get physical networks.

Browse Source
This commit is contained in:
Jessica Wang 2014-11-12 16:24:15 -08:00
parent 6c955a3a47
commit 9809164654
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ui/scripts/sharedFunctions.js
View File

@ -262,7 +262,7 @@ var addGuestNetworkDialog = {
if (items != null) { if (items != null) {
for (var i = 0; i < items.length; i++) { for (var i = 0; i < items.length; i++) {
if (items[i].networktype == 'Advanced') { if (items[i].networktype == 'Advanced') {
addGuestNetworkDialog.zoneObjs.push(items[i]); addGuestNetworkDialog.zoneObjs.push(items[i]);
} }
} }
} }
@ -288,42 +288,44 @@ var addGuestNetworkDialog = {
if ('physicalNetworks' in args.context) { //Infrastructure menu > zone detail > guest traffic type > network tab (only shown in advanced zone) > add guest network dialog if ('physicalNetworks' in args.context) { //Infrastructure menu > zone detail > guest traffic type > network tab (only shown in advanced zone) > add guest network dialog
addGuestNetworkDialog.physicalNetworkObjs = args.context.physicalNetworks; addGuestNetworkDialog.physicalNetworkObjs = args.context.physicalNetworks;
} else { //Network menu > guest network section > add guest network dialog } else { //Network menu > guest network section > add guest network dialog
var selectedZoneId = args.$form.find('.form-item[rel=zoneId]').find('select').val(); var selectedZoneId = args.$form.find('.form-item[rel=zoneId]').find('select').val();
$.ajax({ if (selectedZoneId != undefined && selectedZoneId.length > 0) {
url: createURL('listPhysicalNetworks'), $.ajax({
data: { url: createURL('listPhysicalNetworks'),
zoneid: selectedZoneId data: {
}, zoneid: selectedZoneId
async: false, },
success: function(json) { async: false,
var items = []; success: function(json) {
var physicalnetworks = json.listphysicalnetworksresponse.physicalnetwork; var items = [];
if (physicalnetworks != null) { var physicalnetworks = json.listphysicalnetworksresponse.physicalnetwork;
for (var i = 0; i < physicalnetworks.length; i++) { if (physicalnetworks != null) {
$.ajax({ for (var i = 0; i < physicalnetworks.length; i++) {
url: createURL('listTrafficTypes'), $.ajax({
data: { url: createURL('listTrafficTypes'),
physicalnetworkid: physicalnetworks[i].id data: {
}, physicalnetworkid: physicalnetworks[i].id
async: false, },
success: function(json) { async: false,
var traffictypes = json.listtraffictypesresponse.traffictype; success: function(json) {
if (traffictypes != null) { var traffictypes = json.listtraffictypesresponse.traffictype;
for (var k = 0; k < traffictypes.length; k++) { if (traffictypes != null) {
if (traffictypes[k].traffictype == 'Guest') { for (var k = 0; k < traffictypes.length; k++) {
items.push(physicalnetworks[i]); if (traffictypes[k].traffictype == 'Guest') {
break; items.push(physicalnetworks[i]);
} break;
} }
} }
} }
}); }
} });
} }
}
addGuestNetworkDialog.physicalNetworkObjs = items;
} addGuestNetworkDialog.physicalNetworkObjs = items;
}); }
});
}
} }
var items = []; var items = [];
if (addGuestNetworkDialog.physicalNetworkObjs != null) { if (addGuestNetworkDialog.physicalNetworkObjs != null) {