From f9e602ce984fe92378604d596ce579226f6f5dc1 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sat, 22 Jun 2024 15:57:01 -0700 Subject: [PATCH] Bug 37162: Remove the [% IF ( delete_confirmed ) %] stuff in auth_tag_structure.tt Since auth_tag_structure.pl redirects after deleting when the op is delete_confirmed (which is actually cud-delete_confirmed) rather than loading the template, there's no reason to have dead code for IF ( delete_confirmed ) which is both never set, and is never called when anything like it is set. Test plan: 1. With the patch applied, Administration - Authority types - Chronological Term row - Actions menu - MARC Structure 2. You've already verified that auth_tag_structure.tt isn't malformed, but for extra fun choose a tag, Actions menu - Delete - Yes, delete and verify that it was deleted Signed-off-by: Sam Lau Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer --- .../en/modules/admin/auth_tag_structure.tt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 1d1b1e83ae..41539f80ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -16,9 +16,6 @@ [% IF ( delete_confirm ) %] [% tx("Confirm deletion of tag '{searchfield}'", { searchfield = searchfield }) | html %] › [% END %] - [% IF ( delete_confirmed ) %] - [% t("Data deleted") | html %] › - [% END %] [% IF ( authtypecode ) %] [% tx("'{authtypecode}' framework", { authtypecode = authtypecode }) | html %] [% ELSE %] @@ -46,7 +43,7 @@ Authority types [% END %] - [% IF ( add_form || delete_confirm || delete_confirmed ) %] + [% IF ( add_form || delete_confirm ) %] [% IF ( authtypecode ) %] [% WRAPPER breadcrumb_item %] [% tx("'{authtypecode}' framework", { authtypecode = authtypecode }) | html %] @@ -84,19 +81,13 @@ [% tx("Confirm deletion of tag '{searchfield}'", { searchfield = searchfield }) | html %] [% END %] [% ELSE %] - [% IF ( delete_confirmed ) %] + [% IF ( authtypecode ) %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Data deleted + [% tx("{authtypecode} framework", { authtypecode = authtypecode }) | html %] [% END %] [% ELSE %] - [% IF ( authtypecode ) %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - [% tx("{authtypecode} framework", { authtypecode = authtypecode }) | html %] - [% END %] - [% ELSE %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - Default framework - [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Default framework [% END %] [% END %] -- 2.39.5