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

(-)a/C4/Reserves.pm (+3 lines)
Lines 542-547 sub CanItemBeReserved{ Link Here
542
        $reservecount = $rowcount->{count};
542
        $reservecount = $rowcount->{count};
543
    }
543
    }
544
    # we check if it's ok or not
544
    # we check if it's ok or not
545
    if( $allowedreserves == 0 ){
546
        return 'noReservesAllowed';
547
    }
545
    if( $reservecount >= $allowedreserves ){
548
    if( $reservecount >= $allowedreserves ){
546
        return 'tooManyReserves';
549
        return 'tooManyReserves';
547
    }
550
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +6 lines)
Lines 268-274 function checkMultiHold() { Link Here
268
    [% UNLESS ( multi_hold ) %]
268
    [% UNLESS ( multi_hold ) %]
269
      <h3>Cannot place hold</h3>
269
      <h3>Cannot place hold</h3>
270
      <ul>
270
      <ul>
271
        [% IF ( exceeded_maxreserves ) %]
271
        [% IF ( no_reserves_allowed) %]
272
          <li><strong>No holds allowed: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> cannot place any holds on these items.</li>
273
        [% ELSIF ( exceeded_maxreserves ) %]
272
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
274
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
273
        [% ELSIF ( alreadypossession ) %]
275
        [% ELSIF ( alreadypossession ) %]
274
          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>is already in possession</strong> of one item</li>
276
          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>is already in possession</strong> of one item</li>
Lines 284-289 function checkMultiHold() { Link Here
284
      </ul>
286
      </ul>
285
    [% ELSE %]
287
    [% ELSE %]
286
        <h3>Cannot place hold on some items</h3>
288
        <h3>Cannot place hold on some items</h3>
289
        [% IF ( no_reserves_allowed) %]
290
          <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>
291
        [% END %]
287
        [% IF ( exceeded_maxreserves ) %]
292
        [% IF ( exceeded_maxreserves ) %]
288
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
293
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
289
        [% END %]
294
        [% END %]
(-)a/reserve/request.pl (-1 / +7 lines)
Lines 151-156 if ($borrowernumber_hold && !$action) { Link Here
151
    my $new_reserves_count = scalar( @biblionumbers );
151
    my $new_reserves_count = scalar( @biblionumbers );
152
152
153
    my $maxreserves = C4::Context->preference('maxreserves');
153
    my $maxreserves = C4::Context->preference('maxreserves');
154
    $template->param( maxreserves => $maxreserves );
155
154
    if ( $maxreserves
156
    if ( $maxreserves
155
        && ( $reserves_count + $new_reserves_count > $maxreserves ) )
157
        && ( $reserves_count + $new_reserves_count > $maxreserves ) )
156
    {
158
    {
Lines 211-216 my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold ); Link Here
211
213
212
my $itemdata_enumchron = 0;
214
my $itemdata_enumchron = 0;
213
my @biblioloop = ();
215
my @biblioloop = ();
216
my $no_reserves_allowed = 0;
214
foreach my $biblionumber (@biblionumbers) {
217
foreach my $biblionumber (@biblionumbers) {
215
218
216
    my %biblioloopiter = ();
219
    my %biblioloopiter = ();
Lines 223-228 foreach my $biblionumber (@biblionumbers) { Link Here
223
226
224
        #All is OK and we can continue
227
        #All is OK and we can continue
225
    }
228
    }
229
    elsif ( $canReserve eq 'noReservesAllowed') {
230
        $no_reserves_allowed = 1;
231
    }
226
    elsif ( $canReserve eq 'tooManyReserves' ) {
232
    elsif ( $canReserve eq 'tooManyReserves' ) {
227
        $exceeded_maxreserves = 1;
233
        $exceeded_maxreserves = 1;
228
    }
234
    }
Lines 622-627 foreach my $biblionumber (@biblionumbers) { Link Here
622
628
623
$template->param( biblioloop => \@biblioloop );
629
$template->param( biblioloop => \@biblioloop );
624
$template->param( biblionumbers => $biblionumbers );
630
$template->param( biblionumbers => $biblionumbers );
631
$template->param( no_reserves_allowed => $no_reserves_allowed );
625
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
632
$template->param( exceeded_maxreserves => $exceeded_maxreserves );
626
633
627
if ($multihold) {
634
if ($multihold) {
628
- 

Return to bug 16787