From 3d0aefe6bc6066d7d9872047e0d3b91a81dcd39e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 24 Oct 2010 00:16:36 -0700 Subject: [PATCH] new UI - host page - after enableMaintenance/cancelMaintenance/forceReconnect, update info in middle menu and right panel. --- ui/new/scripts/cloud.core2.resource.js | 19 ++++++++++--------- ui/new/scripts/cloud.core2.volume.js | 10 +++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js index 55169dfebf7..ed34c0ae01f 100644 --- a/ui/new/scripts/cloud.core2.resource.js +++ b/ui/new/scripts/cloud.core2.resource.js @@ -1518,8 +1518,9 @@ var hostActionMap = { asyncJobResponse: "preparehostformaintenanceresponse", dialogBeforeActionFn : doEnableMaintenanceMode, inProcessText: "Enabling Maintenance Mode....", - afterActionSeccessFn: function(json, $midmenuItem1, id) { - hostJsonToDetailsTab(json.queryasyncjobresultresponse.host[0], $("#right_panel_content #host_page #tab_content_details")); + afterActionSeccessFn: function(json, $midmenuItem1, id) { + hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1); + hostToRightPanel($midmenuItem1); $("#right_panel_content #after_action_info").text("We are actively enabling maintenance on your host. Please refresh periodically for an updated status."); } }, @@ -1529,7 +1530,8 @@ var hostActionMap = { dialogBeforeActionFn : doCancelMaintenanceMode, inProcessText: "Cancelling Maintenance Mode....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - hostJsonToDetailsTab(json.queryasyncjobresultresponse.host[0], $("#right_panel_content #host_page #tab_content_details")); + hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1); + hostToRightPanel($midmenuItem1); $("#right_panel_content #after_action_info").text("We are actively cancelling your scheduled maintenance. Please refresh periodically for an updated status."); } }, @@ -1539,7 +1541,8 @@ var hostActionMap = { dialogBeforeActionFn : doForceReconnect, inProcessText: "Reconnecting....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - hostJsonToDetailsTab(json.queryasyncjobresultresponse.host[0], $("#right_panel_content #host_page #tab_content_details")); + hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1); + hostToRightPanel($midmenuItem1); $("#right_panel_content #after_action_info").text("We are actively reconnecting your host. Please refresh periodically for an updated status."); } }, @@ -1564,7 +1567,7 @@ var hostActionMap = { dataType: "json", success: function(json) { hostToMidmenu(json.listhostsresponse.host[0], $midmenuItem1); - hostToRightPanel($midmenuItem1) + hostToRightPanel($midmenuItem1); } }); } @@ -1732,8 +1735,7 @@ var zoneActionMap = { api: "deleteZone", isAsyncJob: false, inProcessText: "Deleting Zone....", - afterActionSeccessFn: function(json, id, midmenuItemId) { - var $midmenuItem1 = $("#"+midmenuItemId); //zone node in zone tree in left menu + afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp(function() { $(this).remove(); }); @@ -1748,8 +1750,7 @@ var podActionMap = { api: "deletePod", isAsyncJob: false, inProcessText: "Deleting Pod....", - afterActionSeccessFn: function(json, id, midmenuItemId) { - var $midmenuItem1 = $("#"+midmenuItemId); //pod node in zone tree in left menu + afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp(function() { $(this).remove(); }); diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js index ec7debfeb9b..183c5eaace7 100644 --- a/ui/new/scripts/cloud.core2.volume.js +++ b/ui/new/scripts/cloud.core2.volume.js @@ -542,7 +542,7 @@ var volumeActionMap = { jsonObj = json.listvolumesresponse.volume[0]; } }); - volumeToMidmenu(jsonObj, $midmenuItem1); + volumeToMidmenu(jsonObj, $midmenuItem1); volumeJsonToDetailsTab($midmenuItem1); } }, @@ -572,14 +572,14 @@ var volumeActionMap = { asyncJobResponse: "createtemplateresponse", dialogBeforeActionFn : doCreateTemplateFromVolume, inProcessText: "Creating template....", - afterActionSeccessFn: function(json, $midmenuItem1, id){} + afterActionSeccessFn: function(json, $midmenuItem1, id) {} }, "Delete Volume": { api: "deleteVolume", isAsyncJob: false, inProcessText: "Deleting volume....", - afterActionSeccessFn: function(json, $midmenuItem1, id){ - $("#"+midmenuItemId).remove(); + afterActionSeccessFn: function(json, $midmenuItem1, id) { + $midmenuItem1.remove(); clearRightPanel(); volumeClearRightPanel(); } @@ -589,7 +589,7 @@ var volumeActionMap = { asyncJobResponse: "createsnapshotresponse", dialogBeforeActionFn : doTakeSnapshot, inProcessText: "Taking Snapshot....", - afterActionSeccessFn: function(json, $midmenuItem1, id) { } + afterActionSeccessFn: function(json, $midmenuItem1, id) {} }, "Recurring Snapshot": { dialogBeforeActionFn : doRecurringSnapshot