From cc0eb59aef79865dfba2eae1c9378d2914fd8ae2 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 14 Jun 2011 10:34:01 -0700
Subject: [PATCH] bug 10247: cloudStack UI - Primary Storage page - Add Primary
 Storage dialog - default cluster dropdown to the cluster that the primary
 storage is under.

---
 ui/scripts/cloud.core.pod.js      |  2 +-
 ui/scripts/cloud.core.resource.js | 10 +++++++---
 ui/scripts/cloud.core.zone.js     |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 7b84838e4d0..a0a72d8c944 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -749,7 +749,7 @@ function bindAddPrimaryStorageButton($leftmenuItem1) {
         $dialogAddPool.find("#pod_name").text(fromdb(clusterObj.podname)); 
     }
                                          
-    populateClusterFieldInAddPoolDialog($dialogAddPool, podId);   
+    populateClusterFieldInAddPoolDialog($dialogAddPool, podId, sourceClusterId);   
         		 
     $button.unbind("click").bind("click", function(event) {           
         $dialogAddPool.find("#info_container").hide();	        
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index d088207dc95..c9398ef1a3a 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -1678,7 +1678,7 @@ function initUpdateConsoleCertButton($midMenuAddLink2) {
 
 var clustersUnderPod = {};
 
-function populateClusterFieldInAddPoolDialog($dialog, podId) {   
+function populateClusterFieldInAddPoolDialog($dialog, podId, clusterId) {   
     if(podId == null) {
         var $clusterSelect = $dialog.find("#pool_cluster").empty();	
         $clusterSelect.change();		
@@ -1696,7 +1696,11 @@ function populateClusterFieldInAddPoolDialog($dialog, podId) {
             if(items != null && items.length > 0) {			                
                 for(var i=0; i<items.length; i++) {
                 	clustersUnderPod["cluster_"+items[i].id] = items[i];
-                    $clusterSelect.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");	
+                	                	
+                	if(clusterId != null && items[i].id == clusterId)
+                        $clusterSelect.append("<option value='" + items[i].id + "' selected>" + fromdb(items[i].name) + "</option>");	
+                    else               
+                        $clusterSelect.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");	
                 }                  
             }     
             $clusterSelect.change();	                     
@@ -1731,7 +1735,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
 
     $dialogAddPool.find("#pod_dropdown").bind("change", function(event) {			   
         var podId = $(this).val();              
-        populateClusterFieldInAddPoolDialog($dialogAddPool, podId);       
+        populateClusterFieldInAddPoolDialog($dialogAddPool, podId, null);       
     });        
        
     $("#add_primarystorage_shortcut").unbind("click").bind("click", function(event) { 
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 30b22edc69e..15f8b59de8e 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -931,7 +931,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
     
     $podSelect.unbind("change").bind("change", function(event) {	        
         var podId = $(this).val();        
-        populateClusterFieldInAddPoolDialog($dialogAddPool, podId);   
+        populateClusterFieldInAddPoolDialog($dialogAddPool, podId, null);   
     });
           
     $button.unbind("click").bind("click", function(event) {