From 0b678f08dfd2d1633b030a054db3afa02ccd8dc0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 17 Dec 2010 14:20:23 -0800
Subject: [PATCH] Host page - fix a bug that caused a javascript error when
 clicking Add Primary Storage dialog.

---
 ui/scripts/cloud.core.host.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js
index 8078e2e20da..4af8f406e88 100644
--- a/ui/scripts/cloud.core.host.js
+++ b/ui/scripts/cloud.core.host.js
@@ -91,10 +91,7 @@ function hostToRightPanel($midmenuItem1) {
     }
 }
 
-function afterLoadHostJSP($midmenuItem1) {
-    initAddHostButton($("#midmenu_add_host_button"), "host_page", $midmenuItem1); 
-    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "host_page", $midmenuItem1);          
-
+function afterLoadHostJSP() {    
     initDialog("dialog_add_host");
     initDialog("dialog_add_pool");
     bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	     
@@ -109,11 +106,9 @@ function afterLoadHostJSP($midmenuItem1) {
     var tabContentArray = [$("#tab_content_details"), $("#tab_content_primarystorage"), $("#tab_content_instance"), $("#tab_content_router"), $("#tab_content_systemvm"), $("#tab_content_statistics")];
     var afterSwitchFnArray = [hostJsonToDetailsTab, hostJsonToPrimaryStorageTab, hostJsonToInstanceTab, hostJsonToRouterTab, hostJsonToSystemvmTab, hostJsonToStatisticsTab];
     switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);    
-    
-    $("#right_panel_content").data("$midmenuItem1", $midmenuItem1);         
 }
 
-function hostJsonToDetailsTab() {   
+function hostJsonToDetailsTab() {  
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
     if($midmenuItem1 == null)
         return;
@@ -122,6 +117,9 @@ function hostJsonToDetailsTab() {
     if(jsonObj == null)
         return;    
     
+    initAddHostButton($("#midmenu_add_host_button"), "host_page", $midmenuItem1); 
+    initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "host_page", $midmenuItem1);          
+    
     $.ajax({
         data: createURL("command=listHosts&id="+jsonObj.id),
         dataType: "json",