Updated Branches: refs/heads/4.2 e444a0381 -> 1308ade2c
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. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1308ade2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1308ade2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1308ade2 Branch: refs/heads/4.2 Commit: 1308ade2cb9ca0faf6f32e1ae5d87ea6d2eb444e Parents: e444a03 Author: Jessica Wang <[email protected]> Authored: Thu Nov 14 14:35:49 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Thu Nov 14 14:37:43 2013 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1308ade2/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index eeec0e0..f632887 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
