From e6cdb1a93bb67570409cbd0d5fa7ff328cb51a03 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 29 Dec 2010 21:21:37 -0800
Subject: [PATCH] zonetree - hide storage node if there is no primary storage
 under a cluster.

---
 ui/index.jsp                      | 49 ++++---------------------------
 ui/scripts/cloud.core.pod.js      |  2 +-
 ui/scripts/cloud.core.resource.js | 25 +++++-----------
 3 files changed, 13 insertions(+), 63 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index ee578428fb0..3ea66faabda 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -848,7 +848,7 @@
             </div>  
         </div>			
         <div id="cluster_content" style="display: none">
-             <div class="leftmenu_expandedlist" id="leftmenu_host_node_template" style="display:block">       
+             <div class="leftmenu_expandedlist" id="leftmenu_host_node_template" style="display:none">       
                 <div id="host_header" class="leftmenu_content">  
                     <div class="leftmenu_sixthindent">
             	        <div class="leftmenu_arrowloader" id="host_loading_container" style="display:none;"></div>
@@ -857,14 +857,8 @@
                         <span>Host</span>               
                     </div>  
                 </div>	           
-            </div>
-            
-            <!--  
-            <div id="hosts_container">
-            </div>	  
-            -->
-             
-            <div class="leftmenu_expandedlist" id="leftmenu_primarystorage_node_template" style="display:block">       
+            </div>           
+            <div class="leftmenu_expandedlist" id="leftmenu_primarystorage_node_template" style="display:none">       
                 <div id="primarystorage_header" class="leftmenu_content">  
                     <div class="leftmenu_sixthindent">
             	        <div class="leftmenu_arrowloader" id="primarystorage_loading_container" style="display:none;"></div>
@@ -873,43 +867,10 @@
                         <span>Storage</span>               
                     </div>  
                 </div>	           
-            </div>
-            
-            <!--          	            
-            <div id="primarystorages_container">
-            </div> 
-            -->           	                       
+            </div>                   	                       
         </div>	    
     </div>
-    <!-- cluster Template (end) -->
-
-    <!-- host Template (begin) --> 
-    <div class="leftmenu_expandedlist" id="leftmenu_host_node_template" style="display:none">       
-        <div id="host_header" class="leftmenu_content">  
-            <div class="leftmenu_sixthindent">
-            	<div class="leftmenu_arrowloader" id="host_loading_container" style="display:none;"></div>
-                <div class="leftmenu_arrows white_nonexpanded_close" id="host_arrow">
-                </div>	                
-                <span id="host_name_label">host: </span>
-                <span id="host_name"></span>
-            </div>  
-        </div>	           
-    </div>
-    <!-- host Template (end) -->
-
-    <!-- primarystorage Template (begin) --> 
-    <div class="leftmenu_expandedlist" id="leftmenu_primarystorage_node_template" style="display:none">       
-        <div id="primarystorage_header" class="leftmenu_content">  
-            <div class="leftmenu_sixthindent">
-            	<div class="leftmenu_arrowloader" id="primarystorage_loading_container" style="display:none;"></div>
-                <div class="leftmenu_arrows white_nonexpanded_close" id="primarystorage_arrow">
-                </div>	                
-                <span id="primarystorage_name_label">Storage: </span>
-                <span id="primarystorage_name"></span>
-            </div>  
-        </div>	           
-    </div>
-    <!-- primarystorage Template (end) -->
+    <!-- cluster Template (end) -->   
     
     <!-- domain tree node template (begin) -->
     <div id="domain_tree_node_template" style="display:none">    	
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 1c93c62b04e..c8205284b16 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -771,7 +771,7 @@ function bindAddPrimaryStorageButton($leftmenuItem1) {
 						    $clusterArrow.click();
 						}
 						
-						$("#cluster_"+clusterId+"_primarystorage").click();	                   
+						$("#cluster_"+clusterId+"_primarystorage").show().click();	                   
 				    },			
                     error: function(XMLHttpResponse) {	  
 						handleError(XMLHttpResponse, function() {
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index a76c6899377..504c46ca8a9 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -238,8 +238,7 @@ function buildZoneTree() {
 		switch (targetId) {
 			case "cluster_arrow" :				    
 			    var $loadingContainer = $thisNode.find("#cluster_loading_container").show();
-                var $clusterArrow = $thisNode.find("#cluster_arrow").hide();			
-			    
+                var $clusterArrow = $thisNode.find("#cluster_arrow").hide();	
 			    var clusterObj = $thisNode.data("jsonObj");
 			    var $clusterContent = $thisNode.find("#cluster_content");				  	   
 				if($target.hasClass("expanded_close")) {										
@@ -248,31 +247,21 @@ function buildZoneTree() {
 	                    dataType: "json",
 	                    async: false,
 	                    success: function(json) {	                        
-	                        var items = json.listhostsresponse.host;	
-	                        var $container = $clusterContent.find("#hosts_container").empty();
+	                        var items = json.listhostsresponse.host;		                        
                             if (items != null && items.length > 0) {					    
-                                for (var i = 0; i < items.length; i++) {
-				                    var $hostNode = $("#leftmenu_host_node_template").clone(true);				                    
-				                    hostJSONToTreeNode(items[i], $hostNode);
-				                    $container.append($hostNode.show());				                    
-			                    }			                                 
+                                $clusterContent.find("#cluster_"+clusterObj.id+"_host").show();    	                                 
                             }	   
 	                    }
                     });    
                                         
                     $.ajax({        
                         data: createURL("command=listStoragePools&clusterid="+clusterObj.id),
-                        dataType: "json",        
+                        dataType: "json", 
+                        async: false,       
                         success: function(json) {    
-                            var items = json.liststoragepoolsresponse.storagepool;   
-                            var $container = $clusterContent.find("#primarystorages_container").empty();
+                            var items = json.liststoragepoolsresponse.storagepool;                              
                             if(items != null && items.length > 0) {              
-                                var $template = $("#leftmenu_primarystorage_node_template");	
-                                for(var i=0; i<items.length;i++) { 
-                                    var $primarystorageNode = $template.clone(true);	            
-	                                primarystorageJSONToTreeNode(items[i], $primarystorageNode);
-	                                $container.append($primarystorageNode.show());		               
-                                }                 
+                                $clusterContent.find("#cluster_"+clusterObj.id+"_primarystorage").show();    	           
                             }              	                
                         }
                     });