@@ -, +, @@ --- Koha/Hold.pm | 14 ++++++ .../intranet-tmpl/prog/en/includes/holds_table.inc | 17 ++++--- koha-tmpl/intranet-tmpl/prog/js/holds.js | 57 ++++++++++++++++------ .../bootstrap/en/includes/holds-table.inc | 13 ++++- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 9 +++- opac/opac-user.pl | 20 +++++++- reserve/request.pl | 53 ++++++++++++++------ svc/holds | 29 +++++++++-- 8 files changed, 164 insertions(+), 48 deletions(-) --- a/Koha/Hold.pm +++ a/Koha/Hold.pm @@ -386,6 +386,20 @@ sub cancel { return $self; } +=head3 hold_group + +Returns the Koha::Hold objects with this hold_group_id + +=cut + +sub hold_group { + my ($self) = @_; + + $self->{_hold_group} ||= Koha::Holds->search({ hold_group_id => $self->hold_group_id }); + + return $self->{_hold_group}; +} + =head3 _move_to_old my $is_moved = $hold->_move_to_old; --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -38,9 +38,7 @@ [% ELSE %] [% END %] - [% END %] - - [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] + [% ELSIF ( CAN_user_reserveforothers_modify_holds_priority ) %] [% IF Koha.Preference('HoldsSplitQueueNumbering') == 'actual' %] [% FOREACH optionloo IN hold.optionloop %] [% IF ( optionloo.selected ) %] @@ -136,7 +134,15 @@ [% END %] [% ELSE %] - [% IF ( hold.item_level_hold ) %] + [% IF ( hold.hold_group ) %] + Group hold +
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -162,7 +162,7 @@
[% END %]
- [% IF ( RESERVES.count ) %] |