From 5be1a2373870aa67fe49bd19798ae8f7ef83c4c8 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 22 Nov 2011 17:56:39 -0800 Subject: [PATCH] cloudStack 3.0 new UI - zone chart - NetScaler - implement Delet action. --- ui/scripts/system.js | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index beae0071982..f2d2841c3e1 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -940,12 +940,11 @@ providerActionFilter: function(args) { var allowedActions = []; var jsonObj = nspMap["netscaler"]; - if(jsonObj.state == "Enabled") { - allowedActions.push("disable"); - } - else if(jsonObj.state == "Disabled") { - allowedActions.push("enable"); - } + if(jsonObj.state == "Enabled") + allowedActions.push("disable"); + else if(jsonObj.state == "Disabled") + allowedActions.push("enable"); + allowedActions.push("shutdown"); return allowedActions; }, providerActions: { @@ -1004,27 +1003,22 @@ notification: function() { return 'Disabled Netscaler provider'; } }, notification: { poll: pollAsyncJobResult } - } - - //"Updating the provider state to 'Shutdown' is not supported" - /* - , + }, shutdown: { label: 'Shutdown', action: function(args) { $.ajax({ - url: createURL("updateNetworkServiceProvider&id=" + nspMap["netscaler"].id + "&state=Shutdown"), + url: createURL("deleteNetworkServiceProvider&id=" + nspMap["netscaler"].id), dataType: "json", - success: function(json) { - var jid = json.updatenetworkserviceproviderresponse.jobid; + success: function(json) { + var jid = json.deletenetworkserviceproviderresponse.jobid; args.response.success( {_custom: { jobId: jid, - getUpdatedItem: function(json) { - var item = json.queryasyncjobresultresponse.jobresult.networkserviceprovider; - nspMap["netscaler"] = item; - return item; + getUpdatedItem: function(json) { + nspMap["netscaler"] = null; + return {}; //nothing in this network service provider needs to be updated, in fact, this whole network service provider has being deleted } } } @@ -1036,8 +1030,7 @@ notification: function() { return 'Shutdown Netscaler provider'; } }, notification: { poll: pollAsyncJobResult } - } - */ + } }, actions: { add: {