diff --git a/circ/circulation.pl b/circ/circulation.pl index 0a9906028e..c76154a9c1 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -598,7 +598,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, ); diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl index 7bc73f6da6..4cb5b021ab 100755 --- a/circ/view_holdsqueue.pl +++ b/circ/view_holdsqueue.pl @@ -55,6 +55,16 @@ 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 new file mode 100644 index 0000000000..8f0f9f7e50 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc @@ -0,0 +1,14 @@ + 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 fdbaabed25..b4b0f97ee3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -266,6 +266,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 -%] 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 29aa6532b9..7c78d55b6c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1078,6 +1078,8 @@ [% END %] [% INCLUDE modals/cancel_booking.inc %] +[% INCLUDE 'hold-group-modal.inc' %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'select2.inc' %] @@ -1117,6 +1119,7 @@ [% Asset.js("js/cancel_booking_modal.js") | $raw %] [% Asset.js("js/combobox.js") | $raw %] [% INCLUDE 'js-biblio-format.inc' %] + [% Asset.js("js/hold-group.js") | $raw %]