From 6656a348f4c32376d73a13089939b16395ee57e8 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 9 Nov 2010 13:44:18 -0800 Subject: [PATCH] revert change that was overriden by another checkin 16 hours ago (21f8bfde8bcf4ec7e322a40f059fe70c31e801e9) (Mon Nov 8 21:15) --- ui/scripts/cloud.core.host.js | 25 ++++++++++++------------- ui/scripts/cloud.core.primarystorage.js | 8 +++++--- ui/scripts/cloud.core.template.js | 17 ++--------------- ui/scripts/cloud.core.zone.js | 3 ++- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/ui/scripts/cloud.core.host.js b/ui/scripts/cloud.core.host.js index 462482a0471..49351df825b 100644 --- a/ui/scripts/cloud.core.host.js +++ b/ui/scripts/cloud.core.host.js @@ -202,7 +202,8 @@ var hostActionMap = { dialogBeforeActionFn: doEnableMaintenanceMode, inProcessText: "Enabling Maintenance Mode....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1); + var item = json.queryasyncjobresultresponse.jobresult.host; + hostToMidmenu(item, $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."); } @@ -213,7 +214,8 @@ var hostActionMap = { dialogBeforeActionFn: doCancelMaintenanceMode, inProcessText: "Cancelling Maintenance Mode....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - hostToMidmenu(json.queryasyncjobresultresponse.host[0], $midmenuItem1); + var item = json.queryasyncjobresultresponse.jobresult.host; + hostToMidmenu(item, $midmenuItem1); hostToRightPanel($midmenuItem1); $("#right_panel_content #after_action_info").text("We are actively cancelling your scheduled maintenance. Please refresh periodically for an updated status."); } @@ -224,7 +226,8 @@ var hostActionMap = { dialogBeforeActionFn: doForceReconnect, inProcessText: "Reconnecting....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - hostToMidmenu(json.queryasyncjobresultresponse.jobresult.host, $midmenuItem1); + var item = json.queryasyncjobresultresponse.jobresult.host; + hostToMidmenu(item, $midmenuItem1); hostToRightPanel($midmenuItem1); $("#right_panel_content #after_action_info").text("We are actively reconnecting your host. Please refresh periodically for an updated status."); } @@ -234,7 +237,9 @@ var hostActionMap = { dialogBeforeActionFn: doRemoveHost, inProcessText: "Removing Host....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - $midmenuItem1.remove(); + $midmenuItem1.slideUp("slow", function() { + $(this).remove(); + }); clearRightPanel(); hostClearRightPanel(); } @@ -244,15 +249,9 @@ var hostActionMap = { dialogBeforeActionFn: doUpdateOSPreference, inProcessText: "Updating OS Preference....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - //call listHosts API before bug 6650 ("updateHost API should return an embedded object like what listHosts API does") is fixed. - $.ajax({ - data: createURL("command=listHosts&id="+id), - dataType: "json", - success: function(json) { - hostToMidmenu(json.listhostsresponse.host[0], $midmenuItem1); - hostToRightPanel($midmenuItem1); - } - }); + var item = json.updatehostresponse.host; + hostToMidmenu(item, $midmenuItem1); + hostToRightPanel($midmenuItem1); } } } diff --git a/ui/scripts/cloud.core.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js index 11c3e9479ff..daf7dc9c76a 100644 --- a/ui/scripts/cloud.core.primarystorage.js +++ b/ui/scripts/cloud.core.primarystorage.js @@ -112,7 +112,7 @@ var primarystorageActionMap = { dialogBeforeActionFn: doEnableMaintenanceModeForPrimaryStorage, inProcessText: "Enabling Maintenance Mode....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - var item = json.queryasyncjobresultresponse.jobresult.prepareprimarystorageformaintenanceresponse; + var item = json.queryasyncjobresultresponse.jobresult.storagepool; primarystorageToMidmenu(item, $midmenuItem1); primarystorageToRightPanel($midmenuItem1); $("#right_panel_content #after_action_info").text("We are actively enabling maintenance. Please refresh periodically for an updated status."); @@ -124,7 +124,7 @@ var primarystorageActionMap = { dialogBeforeActionFn: doCancelMaintenanceModeForPrimaryStorage, inProcessText: "Cancelling Maintenance Mode....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - var item = json.queryasyncjobresultresponse.jobresult.cancelprimarystoragemaintenanceresponse; + var item = json.queryasyncjobresultresponse.jobresult.storagepool; primarystorageToMidmenu(item, $midmenuItem1); primarystorageToRightPanel($midmenuItem1); $("#right_panel_content #after_action_info").text("We are actively cancelling your scheduled maintenance. Please refresh periodically for an updated status."); @@ -135,7 +135,9 @@ var primarystorageActionMap = { dialogBeforeActionFn: doDeletePrimaryStorage, inProcessText: "Deleting Primary Storage....", afterActionSeccessFn: function(json, $midmenuItem1, id) { - $midmenuItem1.remove(); + $midmenuItem1.slideUp("slow", function() { + $(this).remove(); + }); clearRightPanel(); primarystorageClearRightPanel(); } diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index 4722fd3af56..7e37c14b744 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -220,21 +220,8 @@ function templateJsonToDetailsTab() { $thisTab.find("#tab_container").hide(); $thisTab.find("#tab_spinning_wheel").show(); - var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1"); - var id = $midmenuItem1.data("jsonObj").id; - var zoneid = $midmenuItem1.data("jsonObj").zoneid; - - var jsonObj; - $.ajax({ - data: createURL("command=listTemplates&templatefilter=self&id="+id+"&zoneid="+zoneid), - dataType: "json", - async: false, - success: function(json) { - var items = json.listtemplatesresponse.template; - if(items != null && items.length > 0) - jsonObj = items[0]; - } - }); + var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1"); + var jsonObj = $midmenuItem1.data("jsonObj"); $thisTab.data("jsonObj", jsonObj); $midmenuItem1.data("jsonObj", jsonObj); diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js index 437fc124dd8..3c817dd15c9 100644 --- a/ui/scripts/cloud.core.zone.js +++ b/ui/scripts/cloud.core.zone.js @@ -418,7 +418,8 @@ function initAddVLANButton($addButton) { else //virtual $template1.find("#vlan_type_icon").removeClass("direct").addClass("virtual"); - vlanJsonToTemplate(json.createvlaniprangeresponse.vlaniprange, $template1); + var item = json.createvlaniprangeresponse.vlan; + vlanJsonToTemplate(item, $template1); $vlanContainer.prepend($template1); $template1.fadeIn("slow"); },