Updated Branches: refs/heads/4.2 30484fb7f -> cb609d24d
CLOUDSTACK-4142: UI > Infrastructure > zone > physical network > guest > edit guest network > network offering dropdown > get info of current network offering from listNetworks API response instead of listNetworkOfferings API response. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb609d24 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb609d24 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb609d24 Branch: refs/heads/4.2 Commit: cb609d24d6c499a4c4d226a2c19e8f8bb2df58fa Parents: 30484fb Author: Jessica Wang <[email protected]> Authored: Wed Aug 14 13:39:36 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Wed Aug 14 13:40:46 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb609d24/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index d6c52cf..5ce32bc 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1723,20 +1723,13 @@ }); } }); - $.ajax({ - url: createURL("listNetworkOfferings&id=" + selectedGuestNetworkObj.networkofferingid), //include currently selected network offeirng to dropdown - dataType: "json", - async: false, - success: function(json) { - var networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering; - $(networkOfferingObjs).each(function() { - items.push({ - id: this.id, - description: this.displaytext - }); - }); - } - }); + + //include currently selected network offeirng to dropdown + items.push({ + id: selectedGuestNetworkObj.networkofferingid, + description: selectedGuestNetworkObj.networkofferingdisplaytext + }); + args.response.success({ data: items });
