apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 9888: CloudStack UI - Support multiple secondary stroage for each zone. (before this change, only one secondary storage for each zone)

Browse Source
This commit is contained in:
Jessica Wang 2011-05-17 15:27:34 -07:00
parent b5ab92af89
commit 61cecfec2e
2 changed files with 80 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,10 +116,12 @@ function buildZoneTree() {
$("#secondarystorage_header").unbind("click").bind("click", function(event) { $("#secondarystorage_header").unbind("click").bind("click", function(event) {
selectRowInZoneTree($(this)); selectRowInZoneTree($(this));
clearMiddleMenu(); secondaryStorageClearRightPanel();
hideMiddleMenu(); var zoneObj = $(this).data("zoneObj");
listMidMenuItems(("listHosts&type=SecondaryStorage&zoneid="+zoneObj.id), secondaryStorageGetSearchParams, "listhostsresponse", "host", "jsp/secondarystorage.jsp", afterLoadSecondaryStorageJSP, secondaryStorageToMidmenu, secondaryStorageToRightPanel, getMidmenuId, false, ("zone_"+zoneObj.id+"_secondarystorage"), secondaryStorageRefreshDataBinding);
/*
if(currentRightPanelJSP != "jsp/secondarystorage.jsp") { if(currentRightPanelJSP != "jsp/secondarystorage.jsp") {
removeDialogs(); removeDialogs();
@ -128,7 +130,7 @@ function buildZoneTree() {
currentRightPanelJSP = "jsp/secondarystorage.jsp"; currentRightPanelJSP = "jsp/secondarystorage.jsp";
$(this).data("onRefreshFn", function() { $(this).data("onRefreshFn", function() {
secondaryStorageJsonToDetailsTab(); secondaryStorageToDetailsTab();
}); });
afterLoadSecondaryStorageJSP($thisNode); afterLoadSecondaryStorageJSP($thisNode);
@ -137,7 +139,8 @@ function buildZoneTree() {
else { else {
secondaryStorageRefreshDataBinding(); secondaryStorageRefreshDataBinding();
} }
*/
return false; return false;
}); });
@ -332,7 +335,7 @@ function zoneJSONToTreeNode(jsonObj, $zoneNode) {
var zoneid = jsonObj.id; var zoneid = jsonObj.id;
$zoneNode.attr("id", "zone_" + zoneid); $zoneNode.attr("id", "zone_" + zoneid);
$zoneNode.data("jsonObj", jsonObj); $zoneNode.data("jsonObj", jsonObj);
$zoneNode.find("#secondarystorage_header").data("zoneObj", jsonObj); $zoneNode.find("#secondarystorage_header").data("zoneObj", jsonObj).attr("id",("zone_"+jsonObj.id+"_secondarystorage"));
$zoneNode.find("#network_header").data("jsonObj", jsonObj); $zoneNode.find("#network_header").data("jsonObj", jsonObj);
/* /*

96
ui/scripts/cloud.core.secondarystorage.js
View File

@ -16,44 +16,88 @@
* *
*/ */
function afterLoadSecondaryStorageJSP($midmenuItem1) { function secondaryStorageGetSearchParams() {
var $topButtonContainer = clearButtonsOnTop(); var moreCriteria = [];
$("#top_buttons").appendTo($topButtonContainer);
/*
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
moreCriteria.push("&keyword="+todb(searchInput));
}
var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
var state = $advancedSearchPopup.find("#adv_search_state").val();
if (state!=null && state.length > 0)
moreCriteria.push("&state="+todb(state));
var zone = $advancedSearchPopup.find("#adv_search_zone").val();
if (zone!=null && zone.length > 0)
moreCriteria.push("&zoneId="+zone);
if ($advancedSearchPopup.find("#adv_search_pod_li").css("display") != "none") {
var pod = $advancedSearchPopup.find("#adv_search_pod").val();
if (pod!=null && pod.length > 0)
moreCriteria.push("&podId="+pod);
}
}
*/
return moreCriteria.join("");
}
function afterLoadSecondaryStorageJSP($midmenuItem1) {
initDialog("dialog_add_secondarystorage"); initDialog("dialog_add_secondarystorage");
secondaryStorageRefreshDataBinding(); secondaryStorageRefreshDataBinding();
} }
function secondaryStorageRefreshDataBinding() { function secondaryStorageRefreshDataBinding() {
var $secondaryStorageNode = $selectedSubMenu; var $secondaryStorageNode = $selectedSubMenu;
secondaryStorageJsonToRightPanel($secondaryStorageNode); bindAddSecondaryStorageButton($secondaryStorageNode.data("zoneObj"));
}
function secondaryStorageJsonToRightPanel($midmenuItem1) {
$("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
bindAddSecondaryStorageButton($midmenuItem1.data("zoneObj"));
secondaryStorageJsonToDetailsTab();
} }
function secondaryStorageJsonToDetailsTab() { function secondaryStorageToMidmenu(jsonObj, $midmenuItem1) {
$midmenuItem1.attr("id", getMidmenuId(jsonObj));
$midmenuItem1.data("jsonObj", jsonObj);
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_host.png");
var firstRowText = fromdb(jsonObj.name);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
var secondRowText = fromdb(jsonObj.ipaddress);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function secondaryStorageToRightPanel($midmenuItem1) {
copyActionInfoFromMidMenuToRightPanel($midmenuItem1);
$("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
secondaryStorageToDetailsTab();
}
function secondaryStorageToDetailsTab() {
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1"); var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null) { if($midmenuItem1 == null) {
secondaryStorageClearDetailsTab(); secondaryStorageClearDetailsTab();
return; return;
} }
var zoneObj = $midmenuItem1.data("zoneObj"); var jsonObj = $midmenuItem1.data("jsonObj");
if(zoneObj == null) { if(jsonObj == null) {
secondaryStorageClearDetailsTab(); secondaryStorageClearDetailsTab();
return; return;
} }
var $thisTab = $("#right_panel_content").find("#tab_content_details"); var $thisTab = $("#right_panel_content").find("#tab_content_details");
$thisTab.find("#tab_container").hide(); $thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show(); $thisTab.find("#tab_spinning_wheel").show();
var jsonObj;
$.ajax({ $.ajax({
data: createURL("command=listHosts&type=SecondaryStorage&zoneid="+zoneObj.id), data: createURL("command=listHosts&type=SecondaryStorage&zoneid="+jsonObj.zoneid),
dataType: "json", dataType: "json",
async: false, async: false,
success: function(json) { success: function(json) {
@ -66,7 +110,7 @@ function secondaryStorageJsonToDetailsTab() {
}); });
if(jsonObj == null) { if(jsonObj == null) {
secondaryStorageJsonClearRightPanel(); secondaryStorageClearRightPanel();
$thisTab.find("#tab_spinning_wheel").hide(); $thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show(); $thisTab.find("#tab_container").show();
return; return;
@ -97,7 +141,7 @@ function secondaryStorageJsonToDetailsTab() {
$thisTab.find("#tab_container").show(); $thisTab.find("#tab_container").show();
} }
function secondaryStorageJsonClearRightPanel() { function secondaryStorageClearRightPanel() {
secondaryStorageClearDetailsTab(); secondaryStorageClearDetailsTab();
} }
@ -126,7 +170,7 @@ var secondaryStorageActionMap = {
inProcessText: "label.action.delete.secondary.storage.processing", inProcessText: "label.action.delete.secondary.storage.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id) { afterActionSeccessFn: function(json, $midmenuItem1, id) {
if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) { if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#id").text()) {
secondaryStorageJsonClearRightPanel(); secondaryStorageClearRightPanel();
} }
} }
} }
@ -183,7 +227,7 @@ function bindAddSecondaryStorageButton(zoneObj) {
success: function(json) { success: function(json) {
$thisDialog.find("#spinning_wheel").hide(); $thisDialog.find("#spinning_wheel").hide();
$thisDialog.dialog("close"); $thisDialog.dialog("close");
$("#zone_"+zoneId).find("#secondarystorage_header").click(); $("#zone_"+zoneId+"_secondarystorage").click();
}, },
error: function(XMLHttpResponse) { error: function(XMLHttpResponse) {
handleError(XMLHttpResponse, function() { handleError(XMLHttpResponse, function() {