From 9fdbcd39befe299dffa87c0b99d10e87a61df616 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 16 Apr 2019 05:14:32 +0000 Subject: [PATCH] Bug 21528: UNFINISHED PATCH --- Koha/Hold.pm | 14 ++++++ .../intranet-tmpl/prog/en/includes/holds_table.inc | 17 ++++--- .../prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/hold-group.js | 12 ++--- koha-tmpl/intranet-tmpl/prog/js/holds.js | 52 ++++++++++++++------- .../bootstrap/en/includes/holds-table.inc | 13 +++++- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 9 +++- opac/opac-user.pl | 19 +++++++- reserve/request.pl | 53 ++++++++++++++++------ svc/holds | 29 ++++++++++-- 10 files changed, 163 insertions(+), 57 deletions(-) diff --git a/Koha/Hold.pm b/Koha/Hold.pm index bfd3434..cf28cbd 100644 --- a/Koha/Hold.pm +++ b/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; 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 7426da2..b776d4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/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 +
+ Containing the following items: + [% FOREACH h in hold.hold_group %] +
[% h.item.barcode %] + [% END %] +
+ [% ELSIF ( hold.item_level_hold ) %] Only item @@ -158,9 +164,6 @@ [% END %] [% END %] - [% IF hold.hold_group_id %] -
(part of a hold group)
- [% END %] [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 6901d98..0868a19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -835,7 +835,7 @@ [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] [% Asset.js("js/messaging-preference-form.js") | $raw %] - [% Asset.js("js/hold-group.js") %] + [% Asset.js("js/hold-group.js") | $raw %]