From dd326af83d1cee4b1072c793fe2876643a1dbc6b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 5 Nov 2014 13:26:42 -0800 Subject: [PATCH] CLOUDSTACK-7850: UI > Instances > detailView > Attach ISO option > ISO dropdown > should list only ISOs belonging to the same zone. --- ui/scripts/instances.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index b46c343657a..3d5f9b8f87c 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;