Repository: cloudstack Updated Branches: refs/heads/master 6ac082b9d -> 46e0a2506
CLOUDSTACK-3528: [UI] Fix list calls on accounts page Fix List calls in the processing state forever with invalid name provided with Account name search filter -Added error handling for Events, Instances, Network, Projects, Storage pages where an advanced search by an invalid account name was making the UI to show in progress state forever. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46e0a250 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46e0a250 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46e0a250 Branch: refs/heads/master Commit: 46e0a2506950063d3ed7d983f19599bb6c3c6726 Parents: 6ac082b Author: Gabor Apati-Nagy <gabor.apati-n...@citrix.com> Authored: Fri Nov 7 14:16:28 2014 +0000 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Tue Nov 11 11:31:21 2014 -0800 ---------------------------------------------------------------------- ui/scripts/events.js | 8 +++++++- ui/scripts/instances.js | 8 +++++++- ui/scripts/network.js | 8 +++++++- ui/scripts/projects.js | 8 +++++++- ui/scripts/storage.js | 16 ++++++++++++++-- 5 files changed, 42 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46e0a250/ui/scripts/events.js ---------------------------------------------------------------------- diff --git a/ui/scripts/events.js b/ui/scripts/events.js index ea4b940..a15f996 100644 --- a/ui/scripts/events.js +++ b/ui/scripts/events.js @@ -343,7 +343,13 @@ args.response.success({ data: items }); - } + }, + error: function(XMLHttpResponse) { + cloudStack.dialog.notice({ + message: parseXMLHttpResponse(XMLHttpResponse) + }); + args.response.error(); + } }); }, detailView: { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46e0a250/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 21926ea..867cc76 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -355,7 +355,13 @@ args.response.success({ data: items }); - } + }, + error: function(XMLHttpResponse) { + cloudStack.dialog.notice({ + message: parseXMLHttpResponse(XMLHttpResponse) + }); + args.response.error(); + } }); }, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46e0a250/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index ca76641..fa39179 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -5294,7 +5294,13 @@ args.response.success({ data: items }); - } + }, + error: function(XMLHttpResponse) { + cloudStack.dialog.notice({ + message: parseXMLHttpResponse(XMLHttpResponse) + }); + args.response.error(); + } }); }, actions: { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46e0a250/ui/scripts/projects.js ---------------------------------------------------------------------- diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js index 7453b53..74812a1 100644 --- a/ui/scripts/projects.js +++ b/ui/scripts/projects.js @@ -784,7 +784,13 @@ data: data.listprojectsresponse.project, actionFilter: projectsActionFilter }); - } + }, + error: function(XMLHttpResponse) { + cloudStack.dialog.notice({ + message: parseXMLHttpResponse(XMLHttpResponse) + }); + args.response.error(); + } }); }, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46e0a250/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 90720ac..bb27ae8 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -489,7 +489,13 @@ actionFilter: volumeActionfilter, data: items }); - } + }, + error: function(XMLHttpResponse) { + cloudStack.dialog.notice({ + message: parseXMLHttpResponse(XMLHttpResponse) + }); + args.response.error(); + } }); }, @@ -1676,7 +1682,13 @@ actionFilter: snapshotActionfilter, data: items }); - } + }, + error: function(XMLHttpResponse) { + cloudStack.dialog.notice({ + message: parseXMLHttpResponse(XMLHttpResponse) + }); + args.response.error(); + } }); },
