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

bug 12614: cloudStack 3.0 new UI - system - Add Zone Wizard - basic zone - when securityGroupsEnabled checkbox is checked, only display security-group-enabled network offerings. reviewed-by Brian.

This commit is contained in:
Jessica Wang 2011-12-20 12:15:13 -08:00
parent 508bc692ff
commit 9cbe30e22d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/scripts/system.js
View File

@ -2907,6 +2907,7 @@
}
});
var networkOfferingObjsWithSG = [];
var networkOfferingObjsWithoutSG = [];
$.ajax({
url: createURL("listNetworkOfferings&state=Enabled&guestiptype=Shared"),
@ -2924,8 +2925,10 @@
break;
}
}
if(includingSGP == false) //withoutSG
networkOfferingObjsWithoutSG.push(this);
if(includingSGP == false) //without SG
networkOfferingObjsWithoutSG.push(this);
else //with SG
networkOfferingObjsWithSG.push(this);
});
}
});
@ -2937,7 +2940,7 @@
networkOfferings: networkOfferingObjsWithoutSG,
// Security group-enabled offerings
securityGroupNetworkOfferings: networkOfferingObjs
securityGroupNetworkOfferings: networkOfferingObjsWithSG
});
},