Repository: cloudstack Updated Branches: refs/heads/4.5 6c955a3a4 -> 980916465
CLOUDSTACK-7896: UI > network > Add Guest Network > when zone dropdown is empty, do not make API call to get physical networks. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/98091646 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/98091646 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/98091646 Branch: refs/heads/4.5 Commit: 9809164654159fd1cea4842d76a6a0b97fc72e54 Parents: 6c955a3 Author: Jessica Wang <jessicaw...@apache.org> Authored: Wed Nov 12 16:24:15 2014 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Wed Nov 12 16:25:41 2014 -0800 ---------------------------------------------------------------------- ui/scripts/sharedFunctions.js | 76 +++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/98091646/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 6bcc50e..1adab5b 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -262,7 +262,7 @@ var addGuestNetworkDialog = { if (items != null) { for (var i = 0; i < items.length; i++) { 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 addGuestNetworkDialog.physicalNetworkObjs = args.context.physicalNetworks; } else { //Network menu > guest network section > add guest network dialog - var selectedZoneId = args.$form.find('.form-item[rel=zoneId]').find('select').val(); - $.ajax({ - url: createURL('listPhysicalNetworks'), - data: { - zoneid: selectedZoneId - }, - async: false, - success: function(json) { - var items = []; - var physicalnetworks = json.listphysicalnetworksresponse.physicalnetwork; - if (physicalnetworks != null) { - for (var i = 0; i < physicalnetworks.length; i++) { - $.ajax({ - url: createURL('listTrafficTypes'), - data: { - physicalnetworkid: physicalnetworks[i].id - }, - async: false, - success: function(json) { - var traffictypes = json.listtraffictypesresponse.traffictype; - if (traffictypes != null) { - for (var k = 0; k < traffictypes.length; k++) { - if (traffictypes[k].traffictype == 'Guest') { - items.push(physicalnetworks[i]); - break; - } - } - } - } - }); - } - } - - addGuestNetworkDialog.physicalNetworkObjs = items; - } - }); + var selectedZoneId = args.$form.find('.form-item[rel=zoneId]').find('select').val(); + if (selectedZoneId != undefined && selectedZoneId.length > 0) { + $.ajax({ + url: createURL('listPhysicalNetworks'), + data: { + zoneid: selectedZoneId + }, + async: false, + success: function(json) { + var items = []; + var physicalnetworks = json.listphysicalnetworksresponse.physicalnetwork; + if (physicalnetworks != null) { + for (var i = 0; i < physicalnetworks.length; i++) { + $.ajax({ + url: createURL('listTrafficTypes'), + data: { + physicalnetworkid: physicalnetworks[i].id + }, + async: false, + success: function(json) { + var traffictypes = json.listtraffictypesresponse.traffictype; + if (traffictypes != null) { + for (var k = 0; k < traffictypes.length; k++) { + if (traffictypes[k].traffictype == 'Guest') { + items.push(physicalnetworks[i]); + break; + } + } + } + } + }); + } + } + + addGuestNetworkDialog.physicalNetworkObjs = items; + } + }); + } } var items = []; if (addGuestNetworkDialog.physicalNetworkObjs != null) {
