etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10247: cloudStack UI - Primary Storage page - Add Primary Storage dialog - default cluster dropdown to the cluster that the primary storage is under.

This commit is contained in:
Jessica Wang 2011-06-14 10:34:01 -07:00
parent f7814df488
commit cc0eb59aef
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/scripts/cloud.core.pod.js
View File

@ -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();

10
ui/scripts/cloud.core.resource.js
View File

@ -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) {

2
ui/scripts/cloud.core.zone.js
View File

@ -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) {