From e393e15f7a9fe890ca2c8e61e066e29d782ab3a6 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 3 Dec 2010 11:19:28 -0800
Subject: [PATCH] fix a bug that "no items available" was not removed when
 primary storage was created.

---
 ui/scripts/cloud.core.cluster.js  | 8 +++-----
 ui/scripts/cloud.core.pod.js      | 2 +-
 ui/scripts/cloud.core.resource.js | 2 +-
 ui/scripts/cloud.core.zone.js     | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index cc920c1cf18..896d8a7be54 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -38,8 +38,7 @@ function afterLoadClusterJSP($leftmenuItem1) {
     var $header1 = $("#midmenu_itemheader_without_margin").clone().show();  //without margin on top
     $header1.find("#name").text("Host");
     $container_host.append($header1);    
-    //listMidMenuItems2(("listHosts&type=Routing&clusterid="+clusterId), "listhostsresponse", "host", hostToMidmenu, hostToRightPanel, hostGetMidmenuId, false, 1); 					
-	var count = 0;    
+    var count = 0;    
     $.ajax({
         cache: false,
         data: createURL("command=listHosts&type=Routing&clusterid="+clusterId),
@@ -63,7 +62,7 @@ function afterLoadClusterJSP($leftmenuItem1) {
                 count = items.length;
             }  
             else {
-                $container_host.append($("#midmenu_container_no_items_available").clone().show());  
+                $container_host.append($("#midmenu_container_no_items_available").clone().attr("id","midmenu_container_no_items_available_clone").show());  
             }                  
         }
     });	 	
@@ -75,7 +74,6 @@ function afterLoadClusterJSP($leftmenuItem1) {
 	var $header2 = $("#midmenu_itemheader_with_margin").clone().show(); //with margin on top
     $header2.find("#name").text("Primary Storage");
     $container_primarystorage.append($header2);
-	//listMidMenuItems2(("listStoragePools&clusterid="+clusterId), "liststoragepoolsresponse", "storagepool", primarystorageToMidmenu, primarystorageToRightPanel, primarystorageGetMidmenuId, false, 1); 
 	var count = 0;    
     $.ajax({
         cache: false,
@@ -96,7 +94,7 @@ function afterLoadClusterJSP($leftmenuItem1) {
                 count = items.length;
             }  
             else {
-                $container_primarystorage.append($("#midmenu_container_no_items_available").clone().show());  
+                $container_primarystorage.append($("#midmenu_container_no_items_available").clone().attr("id","midmenu_container_no_items_available_clone").show());  
             }                  
         }
     });	 
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 424e7fa39a0..5d109fe415d 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -543,7 +543,7 @@ function initAddPrimaryStorageButton($button, currentPageInRightPanel, $leftmenu
 					    }
 					    else {	
 					        var $container = $("#midmenu_container").find("#midmenu_primarystorage_container");
-					        var $noItemsAvailable = $container.siblings("#midmenu_container_no_items_available");
+					        var $noItemsAvailable = $container.find("#midmenu_container_no_items_available_clone");
 					        if($noItemsAvailable.length > 0) {
 					            $noItemsAvailable.slideUp("slow", function() {
 					                $(this).remove();
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 20d3d861eb3..e37f3668fdc 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -1145,7 +1145,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
 					    }
 					    else {	
 					        var $container = $("#midmenu_container").find("#midmenu_primarystorage_container");
-					        var $noItemsAvailable = $container.siblings("#midmenu_container_no_items_available");
+					        var $noItemsAvailable = $container.find("#midmenu_container_no_items_available_clone");
 					        if($noItemsAvailable.length > 0) {
 					            $noItemsAvailable.slideUp("slow", function() {
 					                $(this).remove();
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 8e3016000e0..0cbf85fcac9 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -1195,7 +1195,7 @@ function initAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
 					    }
 					    else {	
 					        var $container = $("#midmenu_container").find("#midmenu_primarystorage_container");
-					        var $noItemsAvailable = $container.siblings("#midmenu_container_no_items_available");
+					        var $noItemsAvailable = $container.find("#midmenu_container_no_items_available_clone");
 					        if($noItemsAvailable.length > 0) {
 					            $noItemsAvailable.slideUp("slow", function() {
 					                $(this).remove();