Skip to content

Commit 9885392

Browse files
author
Jessica Wang
committed
new UI - cluster page - fix a bug "$leftmenuItem1 is not found".
1 parent 6198d6e commit 9885392

1 file changed

Lines changed: 16 additions & 10 deletions

File tree

ui/scripts/cloud.core.cluster.js

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
*
1717
*/
1818

19-
function afterLoadClusterJSP($midmenuItem1) {
19+
function afterLoadClusterJSP($leftmenuItem1) {
2020
showMiddleMenu();
2121

2222
clearAddButtonsOnTop();
23-
initAddHostButton($("#midmenu_add_host_button"), "cluster_page");
24-
initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "cluster_page");
23+
initAddHostButton($("#midmenu_add_host_button"), "cluster_page", $leftmenuItem1);
24+
initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "cluster_page", $leftmenuItem1);
2525

2626
initDialog("dialog_add_host");
2727
initDialog("dialog_add_pool");
2828
bindEventHandlerToDialogAddPool($("#dialog_add_pool"));
2929

30-
clusterJsonToRightPanel($midmenuItem1);
31-
var clusterId = $midmenuItem1.data("jsonObj").id;
30+
clusterJsonToRightPanel($leftmenuItem1);
31+
var clusterId = $leftmenuItem1.data("jsonObj").id;
3232
var $midmenuContainer = $("#midmenu_container").empty();
3333

3434
var $container_host = $("<div id='midmenu_host_container'></div>");
@@ -47,14 +47,20 @@ function afterLoadClusterJSP($midmenuItem1) {
4747
}
4848

4949
function clusterJsonToRightPanel($leftmenuItem1) {
50-
clusterJsonToDetailsTab($leftmenuItem1);
50+
$("#right_panel_content").data("$leftmenuItem1", $leftmenuItem1);
51+
clusterJsonToDetailsTab();
5152
}
5253

53-
function clusterJsonToDetailsTab($leftmenuItem1) {
54+
function clusterJsonToDetailsTab() {
55+
var $leftmenuItem1 = $("#right_panel_content").data("$leftmenuItem1");
56+
if($leftmenuItem1 == null)
57+
return;
58+
5459
var jsonObj = $leftmenuItem1.data("jsonObj");
55-
var $detailsTab = $("#tab_content_details");
56-
$detailsTab.data("jsonObj", jsonObj);
57-
60+
if(jsonObj == null)
61+
return;
62+
63+
var $detailsTab = $("#right_panel_content").find("#tab_content_details");
5864
$detailsTab.find("#id").text(fromdb(jsonObj.id));
5965
$detailsTab.find("#name").text(fromdb(jsonObj.name));
6066
$detailsTab.find("#zonename").text(fromdb(jsonObj.zonename));

0 commit comments

Comments
 (0)