etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Jessica Wang 2012-11-06 11:10:25 -08:00
parent a24ec2bdcc
commit 5b78686474
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/scripts/system.js
View File

@ -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});
}