Repository: cloudstack Updated Branches: refs/heads/4.5 f86eb522e -> 11808ae7f
CLOUDSTACK-7850: UI > Instances > detailView > Attach ISO option > ISO dropdown > should list only ISOs belonging to the same zone. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11808ae7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11808ae7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11808ae7 Branch: refs/heads/4.5 Commit: 11808ae7fb73390c862e09ce0c7d01edf4e8ea62 Parents: f86eb52 Author: Jessica Wang <jessicaw...@apache.org> Authored: Wed Nov 5 13:26:42 2014 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Wed Nov 5 13:26:42 2014 -0800 ---------------------------------------------------------------------- ui/scripts/instances.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11808ae7/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index b46c343..3d5f9b8 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -973,8 +973,12 @@ var items = []; 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; @@ -988,8 +992,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; @@ -1005,8 +1013,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;
