From 11b25e905465565261c4f0ba02b23e4b1763ffd4 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Tue, 13 Mar 2018 13:15:48 +0000 Subject: [PATCH] Bug 20392: Fix handling multi hold when not patron set Test plan: 0) Do not apply the patch 1) Set the system preference DisplayMultiPlaceHold to enable 2) Search in staff client catalogue 3) On results page check more then one result and click on Place hold button at the top of the page 4) Search for patron, but don't be to specific, you need to have more then one result 5) Click on one of the found patron 6) Now you are going to confirm a hold, but only for one record! 7) Apply the patch 8) Repeat 2-5 and confirm that now it is working as expected ( place hold for multiple records) Signed-off-by: delaye Signed-off-by: Maksim Sen --- .../prog/en/includes/circ-patron-search-results.inc | 9 +++++++-- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc index 8d8fcc6..c99e3b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc @@ -17,8 +17,13 @@ [% borrower.surname %], [% borrower.firstname %] [% ELSE %] - - [% borrower.surname %], [% borrower.firstname %] + [% IF ( multi_hold) %] + + [% borrower.surname %], [% borrower.firstname %] + [% ELSE %] + + [% borrower.surname %], [% borrower.firstname %] + [% END %] [% END %] [% borrower.cardnumber %] [% borrower.dateofbirth | $KohaDates %] 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 4a1d6a3..7af7427 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -269,7 +269,7 @@ function checkMultiHold() { [% IF ( messageborrower ) %]

Patron not found

No patron with this name, please, try another

[% END %] -
+
[% UNLESS borrowers %] @@ -277,16 +277,17 @@ function checkMultiHold() {
Enter patron card number or partial name:
-
[% ELSE %] [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %] - [% END %] + [% IF ( multi_hold ) %] + [% ELSE %] + [% END %]
[% ELSIF NOT noitems %] -- 2.7.4