From d867825e66bb7b11cb134c9fd0415ee605840970 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 4 Jan 2011 14:58:16 -0800
Subject: [PATCH] resource page - add host dialog, add primary storage dialog -
 validate cluster dropdown (cluster value is required).

---
 ui/jsp/resource.jsp               |  2 +-
 ui/scripts/cloud.core.pod.js      |  5 +--
 ui/scripts/cloud.core.resource.js | 51 +++----------------------------
 3 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 944ea5ffc70..454f6c3cd91 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -730,7 +730,7 @@
                     Cluster:</label>
                 <select class="select" id="cluster_select">
                 </select>
-                <div id="cluster_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                <div id="cluster_select_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>                    
             <li>
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index d5bd7b6947e..713bf7e779a 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -262,10 +262,7 @@ function refreshClsuterFieldInAddHostDialog(dialogAddHost, podId, clusterId, hyp
                     else               
                         clusterSelect.append("<option value='" + fromdb(items[i].id) + "'>" + fromdb(items[i].name) + "</option>");		
                 }    
-            }
-            else {
-			    clusterSelect.append("<option value='-1'>None Available</option>");               
-            }
+            }            
         }
     });     
 }      
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 7549939282f..136e678e903 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -290,45 +290,6 @@ function buildZoneTree() {
 	});  	
 }    
 
-/*
-function refreshClusterUnderPod($podNode, newClusterName, existingClusterId, noClicking) {  
-    var podId = $podNode.data("podId");     
-    if(podId == null)  //e.g. $podNode is not on the screen (when zone tree is hidden) ($podNode.length==0) 
-        return;
-    
-    var $clusterNode;
-    $.ajax({
-        data: createURL("command=listClusters&podid="+podId),
-        dataType: "json",
-        async: false,
-        success: function(json) {
-            var items = json.listclustersresponse.cluster;  
-            var container = $podNode.find("#clusters_container").empty();
-            if (items != null && items.length > 0) {					    
-                for (var i = 0; i < items.length; i++) {
-                    $clusterNode = $("#leftmenu_cluster_node_template").clone(true); 
-                    var item = items[i];
-                    clusterJSONToTreeNode(item, $clusterNode);
-                    container.append($clusterNode.show());                                     
-                    if(newClusterName != null && fromdb(item.name) == newClusterName && noClicking!=true) {   
-                        $clusterNode.find("#cluster_name").click();                
-                    }                 
-                }                         
-                $podNode.find("#pod_arrow").removeClass("white_nonexpanded_close").addClass("expanded_open");
-                $podNode.find("#pod_content").show();                  
-                
-                if(existingClusterId != null && noClicking!=true) {
-                    $clusterNode = $("#cluster_"+existingClusterId);
-                    $clusterNode.find("#cluster_name").click();	
-                }                      
-            }            
-        }
-    });	
-    
-    return $clusterNode;
-}
-*/
-
 function selectRowInZoneTree($rowToSelect) { 
     if($selectedSubMenu != null)
         $selectedSubMenu.removeClass("selected");    
@@ -866,7 +827,8 @@ function initAddHostShortcut() {
 		        // validate values
 		        var isValid = true;	
 		        isValid &= validateDropDownBox("Zone", $thisDialog.find("#zone_dropdown"), $thisDialog.find("#zone_dropdown_errormsg"));	
-		        isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));									
+		        isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg"));		        
+		        isValid &= validateDropDownBox("Cluster", $thisDialog.find("#cluster_select"), $thisDialog.find("#cluster_select_errormsg"));			        								
 		        isValid &= validateString("Host name", $thisDialog.find("#host_hostname"), $thisDialog.find("#host_hostname_errormsg"));
 		        isValid &= validateString("User name", $thisDialog.find("#host_username"), $thisDialog.find("#host_username_errormsg"));
 		        isValid &= validateString("Password", $thisDialog.find("#host_password"), $thisDialog.find("#host_password_errormsg"));					
@@ -899,9 +861,7 @@ function initAddHostShortcut() {
 		        array1.push("&password="+todb(password));
 									            
 		        var clusterId = $thisDialog.find("#cluster_select").val();			    
-			    if (clusterId != '-1') {
-				    array1.push("&clusterid="+clusterId);
-			    }		        				
+			    array1.push("&clusterid="+clusterId);			    		        				
 				
 		        var hostname = trim($thisDialog.find("#host_hostname").val());
 		        var url;					
@@ -1481,10 +1441,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
 	                if(!$clusterSelect.val())
 	                	$("option", $clusterSelect)[0].attr("selected", "selected");
 	                $clusterSelect.change();	                
-                }
-                else {
-				    $clusterSelect.append("<option value='-1'>None Available</option>");                    
-                }
+                }               
             }
         });
     });