From 9917aa3f35fbaea10fe9de76ea4fd1fe0239d27e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 27 Nov 2024 09:55:23 +0100 Subject: [PATCH] Bug 38543: Do not include rowGroup asset files rowGroup plugin is now part of the datatables.min.js bundle. We no longer need to include its css and js files, and they no longer exist anyway! [2024/11/27 08:52:37] [WARN] File not found : lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css at /kohadevbox/koha/Koha/Template/Plugin/Asset.pm line 107 [2024/11/27 08:52:37] [WARN] File not found : lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js at /kohadevbox/koha/Koha/Template/Plugin/Asset.pm line 84. Test plan: Confirm that the checkouts are grouped "today" and "previous" on the checkout page. Signed-off-by: David Nind Signed-off-by: Matt Blenkinsop Signed-off-by: Katrin Fischer (cherry picked from commit 4b82e00416c73a0e8a1b1e57ed453863d802bf6d) Signed-off-by: Paul Derscheid --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt | 2 -- 3 files changed, 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 9f4ebea64d..da34a34669 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -12,7 +12,6 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] [% SET destination = "circ" %] [% FILTER collapse %] [% IF patron %] @@ -1004,7 +1003,6 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'select2.inc' %] - [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] [% PROCESS 'modal-claims.inc' %] [% PROCESS 'modal-claims-js' %] [% INCLUDE 'js-date-format.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index b7f7eb4e6e..a12b9e3a50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -13,7 +13,6 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] <title>[% FILTER collapse %] [% UNLESS blocking_error %] [% t("Patron details for") | html %] [% INCLUDE 'patron-title.inc' no_html = 1 %] @@ -740,7 +739,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'select2.inc' %] [% PROCESS 'modal-claims-js' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt index a9a3cf10d0..1824a3efcb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -13,7 +13,6 @@ [% t("Koha") | html %] [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] @@ -350,7 +349,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] [% INCLUDE 'format_price.inc' %] [% INCLUDE 'js-date-format.inc' %] [% Asset.js("js/cashup_modal.js") | $raw %]