Updated Branches: refs/heads/master a24ec2bdc -> 5b7868647
CS-16718: cloudstack UI - Infrastructure page - zone detail - physical network - guest (configure) - Networks tab - create network dialog - network offering dropdown - when scope is account or project, show all network offerings including the ones that has SourceNat service. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5b786864 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5b786864 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5b786864 Branch: refs/heads/master Commit: 5b78686474b43a3f344d5b29af8ec89d2192f335 Parents: a24ec2b Author: Jessica Wang <[email protected]> Authored: Tue Nov 6 11:10:25 2012 -0800 Committer: Jessica Wang <[email protected]> Committed: Tue Nov 6 11:14:12 2012 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5b786864/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 2d3fe56..e08403e 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1317,8 +1317,10 @@ networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering; if (networkOfferingObjs != null && networkOfferingObjs.length > 0) { for (var i = 0; i < networkOfferingObjs.length; i++) { - //if args.scope == "account-specific" or "project-specific", exclude Isolated network offerings with SourceNat service (bug 12869) - if(args.scope == "account-specific" || args.scope == "project-specific") { + + //comment out the following 12 lines because of CS-16718 + /* + if(args.scope == "account-specific" || args.scope == "project-specific") { //if args.scope == "account-specific" or "project-specific", exclude Isolated network offerings with SourceNat service (bug 12869) var includingSourceNat = false; var serviceObjArray = networkOfferingObjs[i].service; for(var k = 0; k < serviceObjArray.length; k++) { @@ -1330,6 +1332,7 @@ if(includingSourceNat == true) continue; //skip to next network offering } + */ networkOfferingArray.push({id: networkOfferingObjs[i].id, description: networkOfferingObjs[i].displaytext}); }
