You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/11/06 05:37:28 UTC
[4/6] git commit: updated refs/heads/master to 6766b6c
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/master
Commit: 11808ae7fb73390c862e09ce0c7d01edf4e8ea62
Parents: f86eb52
Author: Jessica Wang <je...@apache.org>
Authored: Wed Nov 5 13:26:42 2014 -0800
Committer: Jessica Wang <je...@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;