From 24ddf2eea416a99e4e1e9e70ed8250ffcb653c48 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 10 Jan 2011 16:40:06 -0800
Subject: [PATCH] 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.

---
 ui/scripts/cloud.core.instance.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 0fce7e39be5..03b55274fe2 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -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;