From 4b3cfe2d7162acc0eb2fe8b0ef9c19b13963b867 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Sun, 3 Oct 2010 14:06:06 -0700
Subject: [PATCH] new UI - attach disk to VM dialog - make vm dropdown field
 required.

---
 ui/new/jsp/volume.jsp                |  2 +-
 ui/new/scripts/cloud.core2.volume.js | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp
index 5cb4bb6f9b3..28c7686a829 100644
--- a/ui/new/jsp/volume.jsp
+++ b/ui/new/jsp/volume.jsp
@@ -582,8 +582,8 @@
                 <label for="volume_vm">
                     Virtual Machine:</label>
                 <select class="select" name="volume_vm" id="volume_vm">
-                    <option value="default">Please wait...</option>
                 </select>
+                <div id="volume_vm_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
             </li>
         </ol>
         </form>
diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js
index f7fbeeeb79a..3aab7019b35 100644
--- a/ui/new/scripts/cloud.core2.volume.js
+++ b/ui/new/scripts/cloud.core2.volume.js
@@ -809,16 +809,18 @@ function doAttachDisk($actionLink, listAPIMap, $detailsTab) {
 	    
     $("#dialog_attach_volume")					
     .dialog('option', 'buttons', { 					    
-	    "Confirm": function() { 	       
-	        var thisDialog = $(this);
-	        thisDialog.dialog("close"); 	
+	    "OK": function() { 	
+	        var $thisDialog = $(this);
+		    				
+			var isValid = true;				
+			isValid &= validateDropDownBox("Virtual Machine", $thisDialog.find("#volume_vm"), $thisDialog.find("#volume_vm_errormsg"));	
+			if (!isValid) 
+			    return;
+			    
+			$thisDialog.dialog("close");	     
 	        
-	        var virtualMachineId = thisDialog.find("#volume_vm").val();		
-	        if(virtualMachineId == null)  {	           
-	            $("#dialog_alert").html("<p>Please attach volume to a valid virtual machine</p>").dialog("open");
-	            return;					            
-	        }	
-	    	
+	        var virtualMachineId = $thisDialog.find("#volume_vm").val();		
+	        	    	
 	    	var id = jsonObj.id;			
 			var apiCommand = "command=attachVolume&id="+id+'&virtualMachineId='+virtualMachineId;
 	    	doActionToDetailsTab(id, $actionLink, apiCommand, listAPIMap);