From e53ce7de78d24754032f8eb80123567fe5e9aa5d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 27 Oct 2010 14:37:48 -0700
Subject: [PATCH] new UI - fix: "Add Secondary Storage VM button visible in
 POD"

---
 ui/new/scripts/cloud.core2.js          | 4 ++++
 ui/new/scripts/cloud.core2.resource.js | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index b7f022ca0b0..62e7564b5be 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -551,6 +551,10 @@ function setBooleanField(value, $field) {
 function clearMiddleMenu() {
     $("#midmenu_container").empty();
     $("#midmenu_action_link").hide();
+    clearAddButtonsOnTop();
+}
+
+function clearAddButtonsOnTop() {
     $("#midmenu_add_link").unbind("click").hide();    
     $("#midmenu_add2_link").unbind("click").hide();     
     $("#midmenu_add3_link").unbind("click").hide();          
diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js
index d540692bf3d..c3677b26c38 100644
--- a/ui/new/scripts/cloud.core2.resource.js
+++ b/ui/new/scripts/cloud.core2.resource.js
@@ -234,6 +234,7 @@ function clusterJSONToTreeNode(json, $clusterNode) {
 
 //$menuItem1 is either $leftmenuItem1 or $midmenuItem1
 function showPage($pageToShow, $menuItem1) {       
+    clearAddButtonsOnTop();       
     if($pageToShow.length == 0) { //resource.jsp is not loaded in right panel      
         $("#right_panel").load("jsp/resource.jsp", function(){  
 			showPage2($($pageToShow.selector), $menuItem1); //$pageToShow is still empty (i.e. $pageToShow.length == 0), So, select the element again.
@@ -264,8 +265,7 @@ function showPage2($pageToShow, $menuItem1) {
         $pageToShow.data("jsonObj", jsonObj);
     }   
     
-    if($pageToShow.attr("id") == "resource_page") {  
-        clearMiddleMenu();       
+    if($pageToShow.attr("id") == "resource_page") {          
         hideMiddleMenu();
         
         initAddZoneButton($("#midmenu_add_link")); 
@@ -314,8 +314,7 @@ function showPage2($pageToShow, $menuItem1) {
 	    	    
 		podJsonToRightPanel($menuItem1);     		
     }  
-    else if($pageToShow.attr("id") == "cluster_page") {
-        clearMiddleMenu(); 
+    else if($pageToShow.attr("id") == "cluster_page") {        
         showMiddleMenu();
         
         $("#midmenu_add_link").unbind("click").hide();              
@@ -325,6 +324,7 @@ function showPage2($pageToShow, $menuItem1) {
 		clusterJsonToRightPanel($menuItem1);
 		
 	    var clusterId = jsonObj.id;
+	    
 	    var $midmenuContainer = $("#midmenu_container").empty();	    
 	    var $header1 = $("#midmenu_itemheader_without_margin").clone();  //without margin on top
 	    $header1.find("#name").text("Host");