From 3b48f866be5a64a3befaeef8b065a6368d613753 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 30 Dec 2010 18:52:12 -0800
Subject: [PATCH] Cluster page - fix a bug that showed wrong field ("vCenter
 Datacenter", "vCenter Datastore") in Add Primary Storage dialog.

---
 ui/scripts/cloud.core.cluster.js        | 5 ++++-
 ui/scripts/cloud.core.pod.js            | 8 +++-----
 ui/scripts/cloud.core.primarystorage.js | 4 +++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js
index 068c7a92dc6..e09ef3ea86f 100644
--- a/ui/scripts/cloud.core.cluster.js
+++ b/ui/scripts/cloud.core.cluster.js
@@ -19,7 +19,10 @@
 function afterLoadClusterJSP($midmenuItem1) {
     hideMiddleMenu();  
     initDialog("dialog_add_host");
-    initDialog("dialog_add_pool");
+    
+    //add pool dialog
+    initDialog("dialog_add_pool");   
+    bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	 
 }
 
 
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index b6cbd0bc683..62a5a97bccd 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -23,13 +23,11 @@
 	$("#top_buttons").appendTo($topButtonContainer); 
  
     initDialog("dialog_add_external_cluster");
-    initDialog("dialog_add_host");
-    initDialog("dialog_add_pool");
+    initDialog("dialog_add_host");    
     initDialog("dialog_add_iprange_to_pod");
     
-    // if hypervisor is KVM, limit the server option to NFS for now
-    if (getHypervisorType() == 'kvm') 
-	    $("#dialog_add_pool").find("#add_pool_protocol").empty().html('<option value="nfs">NFS</option>');	
+    //add pool dialog
+    initDialog("dialog_add_pool");	
     bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	 
     
     //switch between different tabs 
diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js
index a7e8ba15413..ce69c8a2d1e 100644
--- a/ui/scripts/cloud.core.primarystorage.js
+++ b/ui/scripts/cloud.core.primarystorage.js
@@ -71,8 +71,10 @@ function primarystorageToRightPanel($midmenuItem1) {
 }
 
  function afterLoadPrimaryStorageJSP($midmenuItem1) {     
+    //add pool dialog
     initDialog("dialog_add_pool");
-    bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	     
+    bindEventHandlerToDialogAddPool($("#dialog_add_pool"));	  
+       
     initDialog("dialog_confirmation_delete_primarystorage");  
     
     var $primarystorageNode = $selectedSubMenu.parent();