View | Details | Raw Unified | Return to bug 16787
Collapse All | Expand All

(-)a/C4/Reserves.pm (+3 lines)
Lines 394-399 sub CanItemBeReserved { Link Here
394
    }
394
    }
395
395
396
    # we check if it's ok or not
396
    # we check if it's ok or not
397
    if( $allowedreserves == 0 ){
398
        return 'noReservesAllowed';
399
    }
397
    if ( $reservecount >= $allowedreserves ) {
400
    if ( $reservecount >= $allowedreserves ) {
398
        return 'tooManyReserves';
401
        return 'tooManyReserves';
399
    }
402
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-2 / +7 lines)
Lines 297-304 function checkMultiHold() { Link Here
297
    [% UNLESS ( multi_hold ) %]
297
    [% UNLESS ( multi_hold ) %]
298
      <h3>Cannot place hold</h3>
298
      <h3>Cannot place hold</h3>
299
      <ul>
299
      <ul>
300
        [% IF ( exceeded_maxreserves ) %]
300
        [% IF ( no_reserves_allowed) %]
301
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
301
          <li><strong>No holds allowed: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> cannot place any holds on these items.</li>
302
        [% ELSIF ( exceeded_maxreserves ) %]
303
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
302
        [% ELSIF ( exceeded_holds_per_record ) %]
304
        [% ELSIF ( exceeded_holds_per_record ) %]
303
          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
305
          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
304
        [% ELSIF ( alreadypossession ) %]
306
        [% ELSIF ( alreadypossession ) %]
Lines 315-320 function checkMultiHold() { Link Here
315
      </ul>
317
      </ul>
316
    [% ELSE %]
318
    [% ELSE %]
317
        <h3>Cannot place hold on some items</h3>
319
        <h3>Cannot place hold on some items</h3>
320
        [% IF ( no_reserves_allowed) %]
321
          <li><strong>No holds allowed: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> cannot place holds on some of these title's items.</li>
322
        [% END %]
318
        [% IF ( exceeded_maxreserves ) %]
323
        [% IF ( exceeded_maxreserves ) %]
319
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
324
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
320
        [% ELSIF ( exceeded_holds_per_record ) %]
325
        [% ELSIF ( exceeded_holds_per_record ) %]
(-)a/reserve/request.pl (-1 / +7 lines)
Lines 149-154 if ($borrowernumber_hold && !$action) { Link Here
149
    my $new_reserves_count = scalar( @biblionumbers );
149
    my $new_reserves_count = scalar( @biblionumbers );
150
150
151
    my $maxreserves = C4::Context->preference('maxreserves');
151
    my $maxreserves = C4::Context->preference('maxreserves');
152
    $template->param( maxreserves => $maxreserves );
153
152
    if ( $maxreserves
154
    if ( $maxreserves
153
        && ( $reserves_count + $new_reserves_count > $maxreserves ) )
155
        && ( $reserves_count + $new_reserves_count > $maxreserves ) )
154
    {
156
    {
Lines 198-203 my $logged_in_patron = Koha::Patrons->find( $borrowernumber ); Link Here
198
200
199
my $itemdata_enumchron = 0;
201
my $itemdata_enumchron = 0;
200
my @biblioloop = ();
202
my @biblioloop = ();
203
my $no_reserves_allowed = 0;
201
foreach my $biblionumber (@biblionumbers) {
204
foreach my $biblionumber (@biblionumbers) {
202
    next unless $biblionumber =~ m|^\d+$|;
205
    next unless $biblionumber =~ m|^\d+$|;
203
206
Lines 214-219 foreach my $biblionumber (@biblionumbers) { Link Here
214
217
215
                #All is OK and we can continue
218
                #All is OK and we can continue
216
            }
219
            }
220
            elsif ( $canReserve eq 'noReservesAllowed') {
221
                $no_reserves_allowed = 1;
222
            }
217
            elsif ( $canReserve eq 'tooManyReserves' ) {
223
            elsif ( $canReserve eq 'tooManyReserves' ) {
218
                $exceeded_maxreserves = 1;
224
                $exceeded_maxreserves = 1;
219
            }
225
            }
Lines 615-620 foreach my $biblionumber (@biblionumbers) { Link Here
615
621
616
$template->param( biblioloop => \@biblioloop );
622
$template->param( biblioloop => \@biblioloop );
617
$template->param( biblionumbers => $biblionumbers );
623
$template->param( biblionumbers => $biblionumbers );
624
$template->param( no_reserves_allowed => $no_reserves_allowed );
618
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
625
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
619
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
626
$template->param( exceeded_holds_per_record => $exceeded_holds_per_record );
620
627
621
- 

Return to bug 16787