cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.2 to 1870124
Date Mon, 06 Jan 2014 18:42:21 GMT
Updated Branches:
  refs/heads/4.2 55a38ee8f -> 1870124c4


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/1870124c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1870124c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1870124c

Branch: refs/heads/4.2
Commit: 1870124c430d10527d9bd2e122c6d3d5d0a9240b
Parents: 55a38ee
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Jan 3 14:55:53 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Jan 6 10:42:11 2014 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1870124c/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a999966..fdaa239 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6965,7 +6965,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) {
@@ -6981,15 +6981,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));
                                         }
                                     });
                                 },


Mime
View raw message