From 64a87d8e04c026cd48082afc80a9179c450ffc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Sat, 26 Dec 2015 12:28:57 +0100 Subject: [PATCH] Bug 1983: Checkout: Hold repquest when checking out an item already on loan or reserved This patch allows to put a hold on an item that is already checked out or reserved. To test: - Check out an item A - Put a hold on an item B - Verify that the staff user has permission to put holds - Check out item A to a patron X - Try to checkout item A to a patron Y - Verify that you see underneath the buttons for Checkin/Checkout a link with following text: "Click here to place hold for [Patron X' name]" - Verify that the link is stylable (div class circ-scheckoutplacehold) - Verify that the link takes you to the page to place a hold on this biblio for patron Y - Do the same for item B and verify that it works for reserved items as well. - Repeat steps above for a patron who has restrictions, verify that the link does not appear - Log in with a staff member who has no permission to place holds - Repeat steps above for a patron without restrictions, verify that the link does not appear. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart --- circ/circulation.pl | 9 +++++++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 5747fbf..552dfc7 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -422,11 +422,16 @@ if (@$barcodes) { if ($question->{RESERVE_WAITING} or $question->{RESERVED}){ $template->param( - reserveborrowernumber => $question->{'resborrowernumber'}, - itembiblionumber => $getmessageiteminfo->{'biblionumber'} + reserveborrowernumber => $question->{'resborrowernumber'} ); } + $template->param( + itembiblionumber => $getmessageiteminfo->{'biblionumber'} + ); + + + $template_params->{issuecount} = $issue; if ( $iteminfo ) { 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 7c5573a..bfb473a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -408,6 +408,11 @@ $(document).ready(function() { [% END %] +[% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %] + [% UNLESS flagged && noissues %] + + [% END %] +[% END %] [% END %] -- 2.1.0