From 0e1b35198bcd15e43c2bf073caac7b86b4535bc0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 25 Feb 2011 18:16:33 -0800
Subject: [PATCH] bug 8725: snapshot page - create volume from snapshot dialog
 - remove disk offering dropdown.

---
 ui/jsp/snapshot.jsp               |  4 +++-
 ui/scripts/cloud.core.snapshot.js | 11 +++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp
index 20b7bf6f348..cfca394d323 100644
--- a/ui/jsp/snapshot.jsp
+++ b/ui/jsp/snapshot.jsp
@@ -148,6 +148,7 @@ dictionary = {
                 <input class="text" type="text" id="name" />
                 <div id="name_errormsg" class="dialog_formcontent_errormsg" style="display: none;"></div>
             </li>              
+            <!--  
             <li>
                 <label><fmt:message key="label.disk.offering"/>:</label>
                 <select class="select" id="diskoffering_dropdown">
@@ -155,7 +156,8 @@ dictionary = {
                 </select>
                 <div id="diskoffering_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
-            </li>                     
+            </li> 
+            -->                    
         </ol>
         </form>
     </div>
diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js
index 50400e44b3b..de1410d82ef 100644
--- a/ui/scripts/cloud.core.snapshot.js
+++ b/ui/scripts/cloud.core.snapshot.js
@@ -45,6 +45,8 @@ function snapshotGetSearchParams() {
 
 function afterLoadSnapshotJSP() {    
     initDialog("dialog_add_volume_from_snapshot");  
+    
+    /*
     $.ajax({
         data: createURL("command=listDiskOfferings"),
 	    dataType: "json",
@@ -62,7 +64,7 @@ function afterLoadSnapshotJSP() {
 			}	
 	    }
     });	 
-    
+    */
     
     initCreateTemplateFromSnapshotDialog();
 }
@@ -243,16 +245,17 @@ function doCreateVolumeFromSnapshotInSnapshotPage($actionLink, $detailsTab, $mid
                                         
          var isValid = true;					
          isValid &= validateString("Name", $thisDialog.find("#name"), $thisDialog.find("#name_errormsg"));	
-         isValid &= validateDropDownBox("Disk Offering", $thisDialog.find("#diskoffering_dropdown"), $thisDialog.find("#diskoffering_dropdown_errormsg"));					          		
+         //isValid &= validateDropDownBox("Disk Offering", $thisDialog.find("#diskoffering_dropdown"), $thisDialog.find("#diskoffering_dropdown_errormsg"));					          		
          if (!isValid) return;   
          
          $thisDialog.dialog("close");       	                                             
          
          var name = $thisDialog.find("#name").val();	  
-         var diskofferingId = $thisDialog.find("#diskoffering_dropdown").val();	
+         //var diskofferingId = $thisDialog.find("#diskoffering_dropdown").val();	
 		    
          var id = jsonObj.id;
-         var apiCommand = "command=createVolume&snapshotid="+id+"&name="+name+"&diskOfferingId="+diskofferingId;
+         //var apiCommand = "command=createVolume&snapshotid="+id+"&name="+name+"&diskOfferingId="+diskofferingId;
+         var apiCommand = "command=createVolume&snapshotid="+id+"&name="+name;
     	 doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);		
      },
      "Cancel": function() {