From 8d77e9256a87942600cd0698112ed5ba413b5c06 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 10 Jul 2025 06:26:30 +0000 Subject: [PATCH] Bug 15516: (follow-up) Fix some merge bugs --- C4/Reserves.pm | 2 +- Koha/Holds.pm | 5 +---- circ/view_holdsqueue.pl | 10 ---------- .../prog/en/includes/hold-group-modal.inc | 15 +++++++++------ .../prog/en/modules/circ/view_holdsqueue.tt | 3 ++- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index a1740017d1..5bb48365ec 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -391,7 +391,7 @@ sub CanBookBeReserved { $reservesallowed = ( $reservesallowed eq '' ) ? undef : $reservesallowed; - my $count = $patron->holds->search( + my $count = $patron->holds->count_holds( { '-or' => [ { 'me.itemtype' => $params->{itemtype} }, diff --git a/Koha/Holds.pm b/Koha/Holds.pm index 300c10d4b1..62b3e0e8cf 100644 --- a/Koha/Holds.pm +++ b/Koha/Holds.pm @@ -222,11 +222,8 @@ sub count_holds { $search_params->{hold_group_id} = undef; my $holds_without_group_count = $self->search($search_params)->count(); - $search_params = { - hold_group_id => { '!=', undef }, - }; + $search_params->{hold_group_id} = { '!=', undef }; my $hold_groups_count = $self->search( $search_params, { group_by => 'me.hold_group_id' } )->count(); - return $holds_without_group_count + $hold_groups_count; } diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl index 4cb5b021ab..7bc73f6da6 100755 --- a/circ/view_holdsqueue.pl +++ b/circ/view_holdsqueue.pl @@ -55,16 +55,6 @@ if ($run_report) { locationslimit => $locationslimit } ); - for my $item (@$items) { - my $related_hold = Koha::Holds->search( - { - borrowernumber => $item->{borrowernumber}, reservedate => $item->{reservedate}, - biblionumber => $item->{biblionumber} - }, - { order_by => 'reservedate' } - )->next; - $item->{hold_group_id} = $related_hold ? $related_hold->hold_group_id : undef; - } $template->param( branchlimit => $branchlimit, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc index 8f0f9f7e50..45f957c300 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc @@ -1,14 +1,17 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index 1715cfbf95..8663d96dcb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -243,7 +243,8 @@ > or any available [% END %] - [% IF itemsloo.hold_group_id %] + [% # NOTE: This will never work as hold_group_id doesn't appear in the tmp_holdsqueue table %] + [% IF itemsloo.can('hold_group_id') && ( itemsloo.hold_group_id ) %]
(part of a hold group)
[% END %] -- 2.39.5