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

bug 7134: VM Wizard - step 4 - basic zone - only show security groups box when direct.attach.security.groups.enabled is true and hypervisor type is not VmWare.

This commit is contained in:
Jessica Wang 2011-01-10 16:40:06 -08:00
parent 0403549866
commit 24ddf2eea4
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/scripts/cloud.core.instance.js
View File

@ -942,9 +942,11 @@ function initVMWizard() {
});
$thisPopup.find("#wizard_review_network").text(networkName);
}
else { // Basic Network, show security groups
$thisPopup.find("#step4").find("#for_basic_zone").show();
$thisPopup.find("#wizard_review_network").text("Basic Network");
else { // Basic Network
if(getDirectAttachSecurityGroupsEnabled() == "true" && $selectedVmWizardTemplate.data("hypervisor") != "VmWare" ) {
$thisPopup.find("#step4").find("#for_basic_zone").show();
$thisPopup.find("#wizard_review_network").text("Basic Network");
}
}
}
@ -1031,11 +1033,13 @@ function initVMWizard() {
}
moreCriteria.push("&networkIds="+networkIds);
}
else { //zoneObj.networktype == "Basic"
if($thisPopup.find("#wizard_security_groups").val() != null && $thisPopup.find("#wizard_security_groups").val().length > 0) {
var securityGroupList = $thisPopup.find("#wizard_security_groups").val().join(",");
moreCriteria.push("&securitygrouplist="+encodeURIComponent(securityGroupList));
}
else { //Basic zone
if($thisPopup.find("#step4").find("#for_basic_zone").css("style") != "none") {
if($thisPopup.find("#wizard_security_groups").val() != null && $thisPopup.find("#wizard_security_groups").val().length > 0) {
var securityGroupList = $thisPopup.find("#wizard_security_groups").val().join(",");
moreCriteria.push("&securitygrouplist="+encodeURIComponent(securityGroupList));
}
}
}
var diskOfferingId, $diskOfferingElement;