Updated Branches: refs/heads/master aebcec256 -> bea095fa4
CLOUDSTACK-4142: UI > VPC > tier > detailView > edit action > network offering dropdown > get 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/bea095fa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bea095fa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bea095fa Branch: refs/heads/master Commit: bea095fa477bb2780da5c741f8b1d23ebcfdc477 Parents: aebcec2 Author: Jessica Wang <[email protected]> Authored: Wed Aug 14 11:35:49 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Wed Aug 14 11:38:04 2013 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bea095fa/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 4ec158f..8059d6b 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -3463,20 +3463,13 @@ }); } }); - $.ajax({ - url: createURL("listNetworkOfferings&id=" + args.context.networks[0].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: args.context.networks[0].networkofferingid, + description: args.context.networks[0].networkofferingdisplaytext + }); + args.response.success({ data: items });
