@@ -, +, @@
- Make sure you can place multiple holds for a patron you will search for
- Same for simple hold
---
.../prog/en/includes/circ-patron-search-results.inc | 13 ++++++++++---
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 5 +++++
reserve/request.pl | 11 ++++-------
3 files changed, 19 insertions(+), 10 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
@@ -13,12 +13,19 @@
[% FOREACH borrower IN borrowers %]
- [% IF ( destination == "circ" ) %]
+ [% IF destination == "circ" %]
[% borrower.surname %], [% borrower.firstname %]
+ [% ELSIF destination == "holds" %]
+ [% IF multi_hold %]
+ [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&multi_hold=1&biblionumbers=" _ biblionumbers %]
+ [% ELSE %]
+ [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&biblionumber=" _ biblionumber %]
+ [% END %]
+
+ [% borrower.surname %], [% borrower.firstname %]
[% ELSE %]
-
- [% borrower.surname %], [% borrower.firstname %]
+ [%# This does not exist %]
[% END %]
[% borrower.cardnumber %]
[% borrower.dateofbirth | $KohaDates %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -277,7 +277,12 @@ function checkMultiHold() {
Enter patron card number or partial name:
+ [% IF multi_hold %]
+
+
+ [% ELSE %]
+ [% END %]
[% ELSE %]
[% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %]
--- a/reserve/request.pl
+++ a/reserve/request.pl
@@ -65,8 +65,6 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
}
);
-my $multihold = $input->param('multi_hold');
-$template->param(multi_hold => $multihold);
my $showallitems = $input->param('showallitems');
my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
@@ -127,13 +125,16 @@ if ($findborrower) {
}
my @biblionumbers = ();
+my $biblionumber = $input->param('biblionumber');
my $biblionumbers = $input->param('biblionumbers');
-if ($multihold) {
+if ( $biblionumbers ) {
@biblionumbers = split '/', $biblionumbers;
} else {
push @biblionumbers, $input->multi_param('biblionumber');
}
+# FIXME multi_hold should not be a variable but depends on the number of elements in @biblionumbers
+$template->param(multi_hold => scalar $input->param('multi_hold'));
# If we have the borrowernumber because we've performed an action, then we
# don't want to try to place another reserve.
@@ -627,10 +628,6 @@ $template->param( biblionumbers => $biblionumbers );
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
-if ($multihold) {
- $template->param( multi_hold => 1 );
-}
-
if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) {
$template->param( reserve_in_future => 1 );
}
--