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/e81e6ef5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e81e6ef5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e81e6ef5 Branch: refs/heads/4.2 Commit: e81e6ef5eb7477c3dae44f16fa9da1cf571d4c99 Parents: 25cf6c9 Author: Jessica Wang <jessicaw...@apache.org> Authored: Thu Sep 19 10:19:19 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Thu Sep 19 10:20:11 2013 -0700 ---------------------------------------------------------------------- ui/scripts/templates.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e81e6ef5/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),
