etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9172 Added cross zones check to delete template and iso

This commit is contained in:
Patrick Dube 2016-04-20 16:16:32 -04:00
parent e3e5be8ded
commit cfd2ce71ed
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/scripts/templates.js
View File

@ -1451,8 +1451,12 @@
}
},
action: function(args) {
var queryParams = "deleteTemplate&id=" + args.context.templates[0].id;
if (!args.context.templates[0].crossZones){
queryParams += "&zoneid=" + args.context.zones[0].zoneid;
}
$.ajax({
url: createURL("deleteTemplate&id=" + args.context.templates[0].id + "&zoneid=" + args.context.zones[0].zoneid),
url: createURL(queryParams),
dataType: "json",
async: true,
success: function(json) {
@ -2536,12 +2540,12 @@
}
},
action: function(args) {
var array1 = [];
if (args.context.zones[0].zoneid != null)
array1.push("&zoneid=" + args.context.zones[0].zoneid);
var queryParams = "deleteIso&id=" + args.context.isos[0].id;
if (!args.context.isos[0].crossZones){
queryParams += "&zoneid=" + args.context.zones[0].zoneid;
}
$.ajax({
url: createURL("deleteIso&id=" + args.context.isos[0].id + "&zoneid=" + args.context.zones[0].zoneid),
url: createURL(queryParams),
dataType: "json",
async: true,
success: function(json) {