CLOUDSTACK-4767: UI > Intances > Attach ISO action - pass zoneId to listIsos API
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfc01804 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfc01804 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfc01804 Branch: refs/heads/4.2 Commit: dfc0180477e4bf405b54c8362413a0db0a80c8b6 Parents: 503fe75 Author: Jessica Wang <jessicaw...@apache.org> Authored: Mon Sep 30 11:10:09 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Mon Sep 30 11:10:53 2013 -0700 ---------------------------------------------------------------------- ui/scripts/instances.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dfc01804/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index a9f6d1c..f450702 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -825,10 +825,14 @@ label: 'ISO', select: function(args) { var items = []; - var map = {}; + var map = {}; $.ajax({ - url: createURL("listIsos&isReady=true&isofilter=featured"), - dataType: "json", + url: createURL("listIsos"), + data: { + isofilter: 'featured', + isReady: true, + zoneid: args.context.instances[0].zoneid + }, async: false, success: function(json) { var isos = json.listisosresponse.iso; @@ -842,8 +846,12 @@ } }); $.ajax({ - url: createURL("listIsos&isReady=true&isofilter=community"), - dataType: "json", + url: createURL("listIsos"), + data: { + isofilter: 'community', + isReady: true, + zoneid: args.context.instances[0].zoneid + }, async: false, success: function(json) { var isos = json.listisosresponse.iso; @@ -859,8 +867,12 @@ } }); $.ajax({ - url: createURL("listIsos&isReady=true&isofilter=selfexecutable"), - dataType: "json", + url: createURL("listIsos"), + data: { + isofilter: 'selfexecutable', + isReady: true, + zoneid: args.context.instances[0].zoneid + }, async: false, success: function(json) { var isos = json.listisosresponse.iso;
