Bugzilla – Attachment 115128 Details for
Bug 25408
CanBookBeReserved & CanItemBeReserved should check "opacitemholds" policy
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25408: (QA follow-up)
Bug-25408-QA-follow-up.patch (text/plain), 3.69 KB, created by
Arthur Suzuki
on 2021-01-14 04:54:11 UTC
(
hide
)
Description:
Bug 25408: (QA follow-up)
Filename:
MIME Type:
Creator:
Arthur Suzuki
Created:
2021-01-14 04:54:11 UTC
Size:
3.69 KB
patch
obsolete
>From 6aef7e2e5e9db9cb4e9bd5e3e996f937aa151e27 Mon Sep 17 00:00:00 2001 >From: Arthur Suzuki <arthur.suzuki@biblibre.com> >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 @@ > </div> > [% 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 ) %] > <div class="dialog alert"> > > [% UNLESS ( multi_hold ) %] >@@ -324,7 +324,10 @@ > <li> <strong>No items are available</strong> to be placed on hold.</li> > [% ELSIF ( maxreserves ) %] > <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> has too many holds.</li> >+ [% ELSIF ( recordHoldNotAllowed ) %] >+ <li><strong>Record holds not allowed : </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> cannot put a record-level hold on this ressource.</li> > [% END # /IF exceeded_maxreserves %] >+ > </ul> > [% ELSE # UNLESS multi_hold %] > <h3>Cannot place hold on some items</h3> >@@ -493,7 +496,7 @@ > [% IF ( patron.borrowernumber ) %] > [% IF ( override_required ) %] > <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button> >- [% ELSIF ( none_available ) %] >+ [% ELSIF ( none_available || recordHoldNotAllowed ) %] > <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button> > [% ELSE %] > <button type="submit" class="btn btn-default">Place hold</button> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25408
:
104488
|
104496
|
105988
|
105989
|
105990
|
106413
|
106414
|
106521
|
106535
|
106536
|
106537
|
107777
|
107778
|
107779
|
107780
|
111681
|
111682
|
111693
|
111696
|
111716
|
111717
|
111718
|
111719
|
111720
|
111721
|
115125
|
115126
|
115127
|
115128
|
115129
|
115130
|
121524
|
121525
|
121526
|
121527
|
121528
|
121530
|
128505
|
130180
|
130181
|
132658
|
132660
|
132661
|
164680
|
164681
|
164682
|
164684
|
164685
|
164686
|
164693
|
164694
|
164878
|
164879
|
165111
|
165112
|
165442
|
165443
|
165444
|
165445