From 73a6c53907dbda1d4ca73bc62a6ba50c657b4571 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Fri, 9 Oct 2020 13:19:27 +0530 Subject: [PATCH] [UI] Delete the template with the specified zoneid, irrespective of the cross-zones template - Note: Post deletion, if the template doesn't exists in other zone's secondary storage, it will be marked as Inactive --- ui/scripts/templates.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 92167335958..e38afda723d 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -2116,11 +2116,7 @@ createForm: { title: 'label.action.delete.template', desc: function(args) { - if(args.context.templates[0].crossZones == true) { - return 'message.action.delete.template.for.all.zones'; - } else { - return 'message.action.delete.template'; - } + return 'message.action.delete.template'; }, fields: { forced: { @@ -2137,9 +2133,7 @@ }, 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; - } + queryParams += "&zoneid=" + args.context.zones[0].zoneid; $.ajax({ url: createURL(queryParams + "&forced=" + (args.data.forced == "on")), dataType: "json", @@ -3630,9 +3624,7 @@ }, action: function(args) { var queryParams = "deleteIso&id=" + args.context.isos[0].id; - if (!args.context.isos[0].crossZones){ - queryParams += "&zoneid=" + args.context.zones[0].zoneid; - } + queryParams += "&zoneid=" + args.context.zones[0].zoneid; $.ajax({ url: createURL(queryParams), dataType: "json",