@@ -, +, @@ selected --- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 1 - .../intranet-tmpl/prog/en/modules/reserve/request.tt | 13 ------------- .../prog/en/modules/virtualshelves/shelves.tt | 1 - reserve/modrequest.pl | 3 +-- reserve/placerequest.pl | 18 +++++++----------- reserve/request.pl | 7 +++---- 6 files changed, 11 insertions(+), 32 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -645,7 +645,6 @@ -
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -101,16 +101,10 @@ [% IF multi_hold %] - [% ELSE %] [% END %] - - [% IF ( multi_hold ) %] - - - [% END %]
@@ -119,16 +113,11 @@ [% IF multi_hold %] - [% ELSE %] [% END %] - [% IF ( multi_hold ) %] - - - [% END %]
@@ -149,7 +138,6 @@
[% IF ( multi_hold ) %] - @@ -386,7 +374,6 @@ [% IF ( multi_hold ) %] - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -382,7 +382,6 @@ -
--- a/reserve/modrequest.pl +++ a/reserve/modrequest.pl @@ -50,7 +50,6 @@ my @expirationdates = $query->multi_param('expirationdate'); my @branch = $query->multi_param('pickup'); my @itemnumber = $query->multi_param('itemnumber'); my @suspend_until=$query->multi_param('suspend_until'); -my $multi_hold = $query->param('multi_hold'); my $biblionumbers = $query->param('biblionumbers'); my $count=@rank; @@ -94,7 +93,7 @@ if ( $from eq 'borrower'){ print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]"); } else { my $url = "/cgi-bin/koha/reserve/request.pl?"; - if ($multi_hold) { + if (@biblionumber > 1) { $url .= "multi_hold=1&biblionumbers=$biblionumbers"; } else { $url .= "biblionumber=$biblionumber[0]"; --- a/reserve/placerequest.pl +++ a/reserve/placerequest.pl @@ -56,8 +56,9 @@ my $itemtype = $input->param('itemtype') || undef; my $borrower = Koha::Patrons->find( $borrowernumber ); $borrower = $borrower->unblessed if $borrower; -my $multi_hold = $input->param('multi_hold'); -my $biblionumbers = $multi_hold ? $input->param('biblionumbers') : ($biblionumber . '/'); +my $biblionumbers = $input->param('biblionumbers'); +$biblionumbers ||= $biblionumber . '/'; + my $bad_bibs = $input->param('bad_bibs'); my $holds_to_place_count = $input->param('holds_to_place_count') || 1; @@ -105,7 +106,7 @@ if ( $type eq 'str8' && $borrower ) { $checkitem, $found, $itemtype ); } - } elsif ($multi_hold) { + } elsif (@biblionumbers > 1) { my $bibinfo = $bibinfos{$biblionumber}; if ( $can_override || CanBookBeReserved($borrower->{'borrowernumber'}, $biblionumber)->{status} eq 'OK' ) { AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber], @@ -123,15 +124,10 @@ if ( $type eq 'str8' && $borrower ) { } } - if ($multi_hold) { - if ($bad_bibs) { - $biblionumbers .= $bad_bibs; - } - print $input->redirect("request.pl?biblionumbers=$biblionumbers&multi_hold=1"); - } - else { - print $input->redirect("request.pl?biblionumber=$biblionumber"); + if ($bad_bibs) { + $biblionumbers .= $bad_bibs; } + print $input->redirect("request.pl?biblionumber=$biblionumber"); } elsif ( $borrowernumber eq '' ) { print $input->header(); --- a/reserve/request.pl +++ a/reserve/request.pl @@ -168,9 +168,8 @@ if ( $biblionumbers ) { push @biblionumbers, $input->multi_param('biblionumber'); } -my $multihold = scalar $input->param('multi_hold'); -# 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')); +my $multi_hold = @biblionumbers > 1; +$template->param(multi_hold => $multi_hold); # If we have the borrowernumber because we've performed an action, then we # don't want to try to place another reserve. @@ -451,7 +450,7 @@ foreach my $biblionumber (@biblionumbers) { $do_check = $patron->do_check_for_previous_checkout($item) if $wants_check; if ( $do_check && $wants_check ) { $item->{checked_previously} = $do_check; - if ( $multihold ) { + if ( $multi_hold ) { $biblioloopiter{checked_previously} = $do_check; } else { $template->param( checked_previously => $do_check ); --