diff --git a/ui/jsp/secondarystorage.jsp b/ui/jsp/secondarystorage.jsp index 1d040cc818e..090a96b0e32 100644 --- a/ui/jsp/secondarystorage.jsp +++ b/ui/jsp/secondarystorage.jsp @@ -151,3 +151,46 @@ + + + + diff --git a/ui/scripts/cloud.core.secondarystorage.js b/ui/scripts/cloud.core.secondarystorage.js index a8dfcb888dd..a140dea0d09 100644 --- a/ui/scripts/cloud.core.secondarystorage.js +++ b/ui/scripts/cloud.core.secondarystorage.js @@ -18,10 +18,8 @@ function afterLoadSecondaryStorageJSP($midmenuItem1) { var $topButtonContainer = clearButtonsOnTop(); - $("#top_buttons").appendTo($topButtonContainer); - - //initDialog("dialog_add_external_cluster_in_secondaryStorage_page", 320); - + $("#top_buttons").appendTo($topButtonContainer); + initDialog("dialog_add_secondarystorage"); secondaryStorageRefreshDataBinding(); } @@ -31,15 +29,9 @@ function secondaryStorageRefreshDataBinding() { } function secondaryStorageJsonToRightPanel($midmenuItem1) { - $("#right_panel_content").data("$midmenuItem1", $midmenuItem1); - - /* - bindEventHandlerToDialogAddVlanForZone(); - bindAddPodButton($("#add_pod_button"), $midmenuItem1); - bindAddSecondaryStorageButton($("#add_secondarystorage_button"), $midmenuItem1); - */ - - secondaryStorageJsonToDetailsTab(); + $("#right_panel_content").data("$midmenuItem1", $midmenuItem1); + bindAddSecondaryStorageButton($midmenuItem1.data("zoneObj")); + secondaryStorageJsonToDetailsTab(); } function secondaryStorageJsonToDetailsTab() { diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js index 80d50941262..d0a765fc5f0 100644 --- a/ui/scripts/cloud.core.zone.js +++ b/ui/scripts/cloud.core.zone.js @@ -52,7 +52,7 @@ function zoneJsonToRightPanel($leftmenuItem1) { bindAddPodButton($("#add_pod_button"), $leftmenuItem1); //bindAddVLANButton($("#add_vlan_button"), $leftmenuItem1); - bindAddSecondaryStorageButton($("#add_secondarystorage_button"), $leftmenuItem1); + bindAddSecondaryStorageButton($leftmenuItem1.data("jsonObj")); var pods; var zoneObj = $leftmenuItem1.data("jsonObj"); @@ -581,13 +581,8 @@ function bindAddVLANButton($button, $leftmenuItem1) { } -function bindAddSecondaryStorageButton($button, $leftmenuItem1) { - $button.show(); - $button.unbind("click").bind("click", function(event) { - //if($("#tab_content_secondarystorage").css("display") == "none") - // $("#tab_secondarystorage").click(); - - var zoneObj = $leftmenuItem1.data("jsonObj"); +function bindAddSecondaryStorageButton(zoneObj) { + $("#add_secondarystorage_button").unbind("click").bind("click", function(event) { $("#dialog_add_secondarystorage").find("#zone_name").text(fromdb(zoneObj.name)); $("#dialog_add_secondarystorage").find("#info_container").hide(); @@ -615,16 +610,8 @@ function bindAddSecondaryStorageButton($button, $leftmenuItem1) { dataType: "json", success: function(json) { $thisDialog.find("#spinning_wheel").hide(); - $thisDialog.dialog("close"); - - $("#zone_"+zoneId).find("#secondarystorage_header").click(); - /* - var $subgridItem = $("#secondary_storage_tab_template").clone(true); - secondaryStorageJSONToTemplate(json.addsecondarystorageresponse.secondarystorage, $subgridItem); - $subgridItem.find("#after_action_info").text("Secondary storage was added successfully."); - $subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show(); - $("#tab_content_secondarystorage").find("#tab_container").append($subgridItem.show()); - */ + $thisDialog.dialog("close"); + $("#zone_"+zoneId).find("#secondarystorage_header").click(); }, error: function(XMLHttpResponse) { handleError(XMLHttpResponse, function() {