@@ -, +, @@ of titles --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -446,7 +446,7 @@ if ($patron) { my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds my $waiting_holds = $holds->waiting; $template->param( - holds_count => $holds->count(), + holds_count => $holds->count_holds, WaitingHolds => $waiting_holds, ); --- a/circ/view_holdsqueue.pl +++ a/circ/view_holdsqueue.pl @@ -56,6 +56,8 @@ if ( $run_report ) { }); for my $item ( @$items ) { $item->{patron} = Koha::Patrons->find( $item->{borrowernumber} ); + 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, --- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc @@ -0,0 +1,15 @@ + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -186,6 +186,9 @@ [%- IF hold.non_priority -%]
Non priority hold [%- END -%] + [%- IF hold.hold_group_id -%] +
(part of a hold group)
+ [%- END -%] [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%] [%- UNLESS hold.found -%] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1024,6 +1024,8 @@ +[% INCLUDE 'hold-group-modal.inc' %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] @@ -1060,6 +1062,7 @@ [% END %] [% Asset.js("js/holds.js") | $raw %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/hold-group.js") | $raw %]