From 1308ade2cb9ca0faf6f32e1ae5d87ea6d2eb444e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 14 Nov 2013 14:35:49 -0800 Subject: [PATCH] CLOUDSTACK-3154: UI > zone detail > remove VMware data center action > if API returns error, stop spinning wheel and show returned error text in a pop up dialog. --- ui/scripts/system.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index eeec0e03fe2..f632887d897 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -5718,6 +5718,10 @@ args.response.success({ data: args.context.physicalResources[0] }); + }, + error: function(XMLHttpResponse) { + var errorMsg = parseXMLHttpResponse(XMLHttpResponse); + args.response.error(errorMsg); } }); }, @@ -15986,7 +15990,7 @@ var zoneActionfilter = function(args) { var jsonObj = args.context.item; var allowedActions = ['enableSwift']; - + if (jsonObj.vmwaredcId == null) allowedActions.push('addVmwareDc'); else