From 64dc53dffc913f561180c9b85a0fa16dd34fcb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20R=C3=A4is=C3=A4?= Date: Mon, 16 Feb 2026 12:20:06 +0200 Subject: [PATCH 1/3] Bug 23269: (follow-up) Cleanup code --- koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 3 --- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 4 ++-- reserve/request.pl | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index a12f41c60f..1614ec2c2f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -2,9 +2,6 @@ [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] [% USE AuthorisedValues %] -[%#This include depends on the asset js/form-submit.js. Any template making use of this include must import form-submit.js as well. %] -[%#FIXME can form-submit.js be imported into this file directly? %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 3d818f1d91..cb1c9ac1f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -1303,7 +1303,7 @@ [% IF always_show_holds == 'DONT' %] - [% UNLESS reserveloop %] + [% UNLESS total_holds %] Show holds ([% hold_count | html %]) [% END %] [% ELSE %] @@ -1429,7 +1429,7 @@ - [% END # IF reserveloop %] + [% END # IF total_holds %] [% END # UNLESS patron %] [% END %] diff --git a/reserve/request.pl b/reserve/request.pl index 9f0299ff77..c1058cd9ac 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -668,7 +668,6 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) } # existingreserves building - my @reserveloop; my $total_holds = 0; my $hold_branches = []; my $hold_itemtypes = []; @@ -735,7 +734,6 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) $biblioloopiter{title} = $biblio->title; $biblioloopiter{author} = $biblio->author; $biblioloopiter{rank} = $fixedRank; - $biblioloopiter{reserveloop} = \@reserveloop; $biblioloopiter{total_holds} = $total_holds; $biblioloopiter{hold_branches} = $hold_branches; $biblioloopiter{hold_itemtypes} = $hold_itemtypes; @@ -757,10 +755,6 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) $biblioloopiter{reserve_charge} = $reserve_charge; } - if (@reserveloop) { - $template->param( reserveloop => \@reserveloop ); - } - $template->param( total_holds => $total_holds ); if ( $patron && $multi_hold ) { -- 2.34.1