CLOUDSTACK-5606: UI > copy template, copy ISO action > when a template/ISO to be copied is not associated with a specific zone, UI does not pass sourcezoneid parameter to API.

This commit is contained in:
Jessica Wang 2013-12-30 14:51:35 -08:00
parent db8d5f602a
commit c1101eb695

View File

@ -795,11 +795,20 @@
}
}
},
action: function(args) {
$.ajax({
url: createURL("copyTemplate&id=" + args.context.templates[0].id + "&sourcezoneid=" + args.context.templates[0].zoneid + "&destzoneid=" + args.data.destinationZoneId),
dataType: "json",
async: true,
action: function(args) {
var data = {
id: args.context.templates[0].id,
destzoneid: args.data.destinationZoneId
};
if (args.context.templates[0].zoneid != undefined) {
$.extend(data, {
sourcezoneid: args.context.templates[0].zoneid
});
}
$.ajax({
url: createURL('copyTemplate'),
data: data,
success: function(json) {
var jid = json.copytemplateresponse.jobid;
args.response.success({
@ -1557,11 +1566,20 @@
}
}
},
action: function(args) {
$.ajax({
url: createURL("copyIso&id=" + args.context.isos[0].id + "&sourcezoneid=" + args.context.isos[0].zoneid + "&destzoneid=" + args.data.destinationZoneId),
dataType: "json",
async: true,
action: function(args) {
var data = {
id: args.context.isos[0].id,
destzoneid: args.data.destinationZoneId
};
if (args.context.isos[0].zoneid != undefined) {
$.extend(data, {
sourcezoneid: args.context.isos[0].zoneid
});
}
$.ajax({
url: createURL('copyIso'),
data: data,
success: function(json) {
var jid = json.copytemplateresponse.jobid;
args.response.success({