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/master to 160d980
Date Thu, 19 Sep 2013 17:21:06 GMT
Updated Branches:
  refs/heads/master 3650f12e9 -> 160d980c7


CLOUDSTACK-4709: UI > template > register template > when zone dropdown is selected
as All Zones, show all hypervisors supported in cloudstack instead of only hypervisors available
in all zones.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/160d980c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/160d980c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/160d980c

Branch: refs/heads/master
Commit: 160d980c7281892d1e92da84eda637ba92d0a6ba
Parents: 3650f12
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Sep 19 10:19:19 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Sep 19 10:20:57 2013 -0700

----------------------------------------------------------------------
 ui/scripts/templates.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/160d980c/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 3f79b09..dc1a39b 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -181,10 +181,13 @@
                                                 return;
 
                                             var apiCmd;
-                                            if (args.zone == -1)
-                                                apiCmd = "listHypervisors&zoneid=-1";
-                                            else
+                                            if (args.zone == -1) { //All Zones
+                                                //apiCmd = "listHypervisors&zoneid=-1";
//"listHypervisors&zoneid=-1" has been changed to return only hypervisors available in
all zones (bug 8809)
+                                            	apiCmd = "listHypervisors"; 
+                                            }
+                                            else {
                                                 apiCmd = "listHypervisors&zoneid=" +
args.zone;
+                                            }
 
                                             $.ajax({
                                                 url: createURL(apiCmd),


Mime
View raw message