You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/01/03 23:57:03 UTC
git commit: updated refs/heads/master to e5283e9
Updated Branches:
refs/heads/master ab42f7447 -> e5283e966
CLOUDSTACK-5771: UI > Infrastructure > SystemVMs page > listView Search > fix a bug that UI kept spinning when there was no matching result.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5283e96
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5283e96
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5283e96
Branch: refs/heads/master
Commit: e5283e966e3f126edd496089347cd7ef557633a3
Parents: ab42f74
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jan 3 14:55:53 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 3 14:56:49 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5283e96/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ad92b3c..1313859 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -7873,7 +7873,7 @@
data: data,
success: function(json) {
var systemvmObjs = json.listsystemvmsresponse.systemvm;
- if (systemvmObjs != null) {
+ if (systemvmObjs != undefined) {
$.ajax({
url: createURL("listHosts&listAll=true"),
success: function(json) {
@@ -7889,15 +7889,13 @@
args.response.success({
data: systemvmObjs
});
- },
- error: function(json) {
- args.response.error(parseXMLHttpResponse(json));
}
});
+ } else {
+ args.response.success({
+ data: []
+ });
}
- },
- error: function(json) {
- args.response.error(parseXMLHttpResponse(json));
}
});
},