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

CLOUDSTACK-484: cloudstack UI - zone wizard - Hide Guest CIDR field when Advanced/SecurityGroup is selected. Show it otherwise.

This commit is contained in:
Jessica Wang 2012-11-14 14:39:54 -08:00
parent d1fb2f7634
commit 60cec46333
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/scripts/zoneWizard.js
View File

@ -304,7 +304,11 @@
}
else { //args.data['network-model'] == 'Advanced'
args.$form.find('[rel=networkOfferingId]').hide();
args.$form.find('[rel=guestcidraddress]').show();
if(args.data["zone-isolation-mode"] == "VLAN")
args.$form.find('[rel=guestcidraddress]').show();
else //args.data["zone-isolation-mode"] == "SG"
args.$form.find('[rel=guestcidraddress]').hide();
}
setTimeout(function() {
@ -1256,14 +1260,18 @@
var networkType = args.data.zone.networkType; //"Basic", "Advanced"
array1.push("&networktype=" + todb(networkType));
if(networkType == "Advanced") {
if(args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length > 0)
array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
if(args.data.zone.isolationMode != null) {
if(args.data.zone.isolationMode == "SG")
array1.push("&securitygroupenabled=true");
else if(args.data.zone.isolationMode == "VLAN")
array1.push("&securitygroupenabled=false");
if(args.data.zone.isolationMode != null) {
if(args.data.zone.isolationMode == "VLAN") {
array1.push("&securitygroupenabled=false");
if(args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length > 0)
array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
}
else { // args.data.zone.isolationMode == "SG"
array1.push("&securitygroupenabled=true");
}
}
}