apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1676: UI > zone wizard > basic zone > pass securitygroupenabled=true if selected network offering includes security group service; pass securitygroupenabled=false if selected network offering does not include security group service.

Browse Source
This commit is contained in:
Jessica Wang 2013-07-03 17:05:00 -07:00
parent 1bd74420cc
commit 410dff9d89
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ui/scripts/zoneWizard.js
View File

@ -324,42 +324,28 @@
var $form = args.$form;
if (args.data['network-model'] == 'Basic') { //Basic zone
args.$form.find('[rel=networkOfferingId]').show();
args.$form.find('[rel=networkOfferingId]').show(); //will be used to create a guest network during zone creation
args.$form.find('[rel=guestcidraddress]').hide();
args.$form.find('[rel=ip6dns1]').hide();
args.$form.find('[rel=ip6dns2]').hide();
args.$form.find('[rel=ip6dns2]').hide();
}
else { //Advanced zone
args.$form.find('[rel=networkOfferingId]').hide();
if(args.data["zone-advanced-sg-enabled"] != "on") { //Advanced SG-disabled zone
else { //Advanced zone
if(args.data["zone-advanced-sg-enabled"] != "on") { //Advanced SG-disabled zone
args.$form.find('[rel=networkOfferingId]').hide();
args.$form.find('[rel=guestcidraddress]').show();
args.$form.find('[rel=ip6dns1]').show();
args.$form.find('[rel=ip6dns2]').show();
args.$form.find('[rel=ip6dns1]').show();
args.$form.find('[rel=ip6dns2]').show();
}
else { //Advanced SG-enabled zone
args.$form.find('[rel=guestcidraddress]').hide();
else { //Advanced SG-enabled zone
args.$form.find('[rel=networkOfferingId]').show(); //will be used to create a guest network during zone creation
args.$form.find('[rel=guestcidraddress]').hide();
args.$form.find('[rel=ip6dns1]').hide();
args.$form.find('[rel=ip6dns2]').hide();
}
}
/* setTimeout(function() {
if ($form.find('input[name=ispublic]').is(':checked')) {
$form.find('[rel=domain]').show();
$form.find('[rel=accountId]').show();
}
else{
$form.find('[rel=domain]').hide();
$form.find('[rel=accountId]').hide();
}
});*/
args.$form.find('[rel=ip6dns2]').hide();
}
}
},
fields: {
name: {
@ -1723,7 +1709,14 @@
var array1 = [];
var networkType = args.data.zone.networkType; //"Basic", "Advanced"
array1.push("&networktype=" + todb(networkType));
if(networkType == "Advanced") {
if (networkType == "Basic") {
if(selectedNetworkOfferingHavingSG == true)
array1.push("&securitygroupenabled=true");
else
array1.push("&securitygroupenabled=false");
}
else { // networkType == "Advanced"
if(args.data.zone.sgEnabled != true) {
array1.push("&securitygroupenabled=false");