From 6aef7e2e5e9db9cb4e9bd5e3e996f937aa151e27 Mon Sep 17 00:00:00 2001 From: Arthur Suzuki Date: Thu, 14 Jan 2021 01:54:46 +0100 Subject: [PATCH] Bug 25408: (QA follow-up) Added error message when trying to hold on the record and opacitemhold is set to "Force" to item-level hold --- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 7 +++++-- reserve/request.pl | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index d8b8ae07a3..50112eaa37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -304,7 +304,7 @@ [% END %] - [% IF ( exceeded_maxreserves || exceeded_holds_per_record || alreadyreserved || none_available || alreadypossession || ageRestricted ) %] + [% IF ( exceeded_maxreserves || exceeded_holds_per_record || alreadyreserved || none_available || alreadypossession || ageRestricted || recordHoldNotAllowed ) %]
[% UNLESS ( multi_hold ) %] @@ -324,7 +324,10 @@
  • No items are available to be placed on hold.
  • [% ELSIF ( maxreserves ) %]
  • Too many holds: [% patron.firstname | html %] [% patron.surname | html %] has too many holds.
  • + [% ELSIF ( recordHoldNotAllowed ) %] +
  • Record holds not allowed : [% patron.firstname | html %] [% patron.surname | html %] cannot put a record-level hold on this ressource.
  • [% END # /IF exceeded_maxreserves %] + [% ELSE # UNLESS multi_hold %]

    Cannot place hold on some items

    @@ -493,7 +496,7 @@ [% IF ( patron.borrowernumber ) %] [% IF ( override_required ) %] - [% ELSIF ( none_available ) %] + [% ELSIF ( none_available || recordHoldNotAllowed ) %] [% ELSE %] diff --git a/reserve/request.pl b/reserve/request.pl index 38d6f56ed2..57a4deff3f 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -318,6 +318,10 @@ foreach my $biblionumber (@biblionumbers) { $template->param( $canReserve->{status} => 1); $biblioloopiter{ $canReserve->{status} } = 1; } + elsif ( $canReserve->{status} eq 'recordHoldNotAllowed' ) { + $template->param( $canReserve->{status} => 1 ); + $biblioloopiter{ $canReserve->{status} } = 1; + } else { $biblioloopiter{ $canReserve->{status} } = 1; } -- 2.11.0