From 4cb63826a63f74fe697b6628a1fe487c725dad98 Mon Sep 17 00:00:00 2001
From: jessica <jessica@cloud.com>
Date: Mon, 30 Aug 2010 14:12:15 -0700
Subject: [PATCH] new UI - vm wizard - select data disk - set "no, thanks" as
 default.

---
 ui/new/jsp/tab_instance.jsp           |  4 ++--
 ui/new/scripts/cloud.core.instance.js | 28 ++++++++++++---------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ui/new/jsp/tab_instance.jsp b/ui/new/jsp/tab_instance.jsp
index 2309739df5c..9b10e58a0a6 100755
--- a/ui/new/jsp/tab_instance.jsp
+++ b/ui/new/jsp/tab_instance.jsp
@@ -566,12 +566,12 @@
 <!-- VM Wizard - Service Offering template (end) -->
 <!-- VM Wizard - disk Offering template (begin)-->
 <div class="vmpopup_offeringbox" id="vm_popup_disk_offering_template_no" style="display: none">
-    <input type="radio" name="disk_offering_radio" class="radio" />
+    <input type="radio" name="disk_offering_radio" class="radio" value="none" checked />
     <label class="label">
         No Thanks</label>
 </div>
 <div class="vmpopup_offeringbox" id="vm_popup_disk_offering_template_custom" style="display: none">
-    <input type="radio" name="disk_offering_radio" class="radio" />
+    <input type="radio" name="disk_offering_radio" class="radio" value="custom" />
     <label class="label">
         Custom:</label>
     <label class="label1">
diff --git a/ui/new/scripts/cloud.core.instance.js b/ui/new/scripts/cloud.core.instance.js
index 05f28cbb829..1834263a36c 100755
--- a/ui/new/scripts/cloud.core.instance.js
+++ b/ui/new/scripts/cloud.core.instance.js
@@ -513,16 +513,13 @@ function clickInstanceGroupHeader($arrowIcon) {
 			        var $rootDiskOfferingContainer = $("#root_disk_offering_container").empty();
 			        
 			        //"no, thanks" radio button (only data disk offering has the radio button, root disk offering doesn't)		        
-		            var $t = $("#vm_popup_disk_offering_template_no").clone();
-		            $t.find("input:radio[name=disk_offering_radio]").val("no");
+		            var $t = $("#vm_popup_disk_offering_template_no").clone(); //value is set as "none" in tab_instance.tab		          
 		            $dataDiskOfferingContainer.append($t.show()); 
 			        	
 			        //"custom" radio button			        
-			        var $t = $("#vm_popup_disk_offering_template_custom").clone();
-			        $t.find("input:radio[name=disk_offering_radio]").val("custom");
+			        var $t = $("#vm_popup_disk_offering_template_custom").clone(); //value is set as "custom" in tab_instance.tab			        
 			        $dataDiskOfferingContainer.append($t.show());	
-			        var $t = $("#vm_popup_disk_offering_template_custom").clone();
-			        $t.find("input:radio[name=disk_offering_radio]").val("custom");
+			        var $t = $("#vm_popup_disk_offering_template_custom").clone(); //value is set as "custom" in tab_instance.tab	
 			        $rootDiskOfferingContainer.append($t.show());
 				    				    
 			        //var checked = "checked";
@@ -955,16 +952,15 @@ function clickInstanceGroupHeader($arrowIcon) {
 			    moreCriteria.push("&templateId="+$thisPopup.find("#step1 .rev_wiztemplistbox_selected").attr("id"));
     							
 			    moreCriteria.push("&serviceOfferingId="+$thisPopup.find("input:radio[name=service_offering_radio]:checked").val());
-    			    						
-			    if ($thisPopup.find("#wiz_blank").hasClass("rev_wizmid_selectedtempbut")) { //ISO
-			        var diskOfferingId = $thisPopup.find("#root_disk_offering_container input[name=rootdisk]:checked").val();
-				    moreCriteria.push("&diskOfferingId="+diskOfferingId);
-	            }
-			    else { //template
-			        var diskOfferingId = $thisPopup.find("#data_disk_offering_container input[name=datadisk]:checked").val();					    	    
-			        if(diskOfferingId != null && diskOfferingId != "")
-				        moreCriteria.push("&diskOfferingId="+diskOfferingId);	
-		        }							 
+    			
+    			var diskOfferingId;    						
+			    if ($thisPopup.find("#wiz_blank").hasClass("rev_wizmid_selectedtempbut"))  //ISO
+			        diskOfferingId = $thisPopup.find("#root_disk_offering_container input[name=disk_offering_radio]:checked").val();	
+			    else  //template
+			        diskOfferingId = $thisPopup.find("#data_disk_offering_container input[name=disk_offering_radio]:checked").val();				       
+		        			   
+		        if(diskOfferingId != null && diskOfferingId != "" && diskOfferingId != "none" && diskOfferingId != "custom")
+			        moreCriteria.push("&diskOfferingId="+diskOfferingId);						 
     						
 			    vmWizardClose();