From 70bb50988b1ac1f296d8a32a361f1c95554700c9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 3 Apr 2026 11:24:41 +0200 Subject: [PATCH] Bug 42280: Tidy all script tags - admin In order to tidy all the script tags of the .tt files we isolate the interpolation of Template::Toolkit variables in a separate script tag. This patch focuses on the administration module. The 2 main changes are in the following files: * aqplan.tt "0" should be correctly formatted * categories.tt trivial change about table settings Signed-off-by: Paul Derscheid Signed-off-by: Jan Kissig Signed-off-by: Pedro Amorim --- .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 4 +++- .../prog/en/modules/admin/auth_subfields_structure.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/background_jobs.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 2 +- .../prog/en/modules/admin/branch_transfer_limits.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/columns_settings.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/file_transports.tt | 2 +- .../prog/en/modules/admin/identity_provider_domains.tt | 2 +- .../prog/en/modules/admin/item_circulation_alerts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt | 2 +- .../prog/en/modules/admin/marc_subfields_structure.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/matching-rules.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_servers.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/transfer_limits.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/usage_statistics.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 +- 29 files changed, 32 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 635d904b42..a179b004f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -615,7 +615,7 @@ [% Asset.js("js/acq.js") | $raw %] [% IF close_form %] - [% Asset.js("js/biblio_framework.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt index d2b5672b06..515b86e6c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -137,7 +137,7 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 5f59962de2..9c000c0d8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -918,9 +918,10 @@ [% END %] [% MACRO jsinclude BLOCK %] - [% Asset.js("js/admin-menu.js") | $raw %] [% Asset.js("js/messaging-preference-form.js") | $raw %] @@ -929,7 +930,6 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'select2.inc' %] - [% Asset.js("js/marc_subfields_structure.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index fbb89df0cf..533aef8263 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -731,7 +731,7 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") | $raw %] -