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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (+3 lines)
Lines 63-68 Link Here
63
                                </strong>
63
                                </strong>
64
                            [% END %]
64
                            [% END %]
65
                            [% HOLD.biblio.author | html %]
65
                            [% HOLD.biblio.author | html %]
66
                            [% IF HOLD.volume_id %]
67
                                <br/><strong>Next available item from volume <i>[% HOLD.volume.description | html %]</i></strong>
68
                            [% END %]
66
                        </td>
69
                        </td>
67
                        <td class="reservedate">
70
                        <td class="reservedate">
68
                            <span title="[% HOLD.reservedate | html %]">
71
                            <span title="[% HOLD.reservedate | html %]">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-1 / +22 lines)
Lines 289-294 Link Here
289
                                                    </li>
289
                                                    </li>
290
                                                [% END %]
290
                                                [% END %]
291
291
292
                                                [% UNLESS forced_hold_level && ( forced_hold_level == 'item' || forced_hold_level == 'record' ) %]
293
                                                    [% IF bibitemloo.object.volumes %]
294
                                                        <li>
295
                                                            <label for="itemtype">Request specific volume:</label>
296
                                                            <select name="volume_id_[% bibitemloo.biblionumber | html %]" id="volume_id_[% bibitemloo.biblionumber | html %]" size="1">
297
                                                                <option value="">Any volume</option>
298
                                                                [% FOREACH v IN bibitemloo.object.volumes %]
299
                                                                    <option value="[% v.id | html %]">[% v.description | html %]</option>
300
                                                                [% END %]
301
                                                            </select>
302
                                                        </li>
303
                                                    [% END %]
304
                                                [% END %]
305
292
                                                [% IF ( OpacHoldNotes ) %]
306
                                                [% IF ( OpacHoldNotes ) %]
293
                                                    <li>
307
                                                    <li>
294
                                                        <div class="notesrow" id="notesrow_[% bibitemloo.biblionumber | html %]">
308
                                                        <div class="notesrow" id="notesrow_[% bibitemloo.biblionumber | html %]">
Lines 304-310 Link Here
304
                                                [% IF bibitemloo.itemholdable %]
318
                                                [% IF bibitemloo.itemholdable %]
305
                                                    <!-- ITEM HOLDS -->
319
                                                    <!-- ITEM HOLDS -->
306
                                                    <li class="lradio place_on_type" style="display:none;">
320
                                                    <li class="lradio place_on_type" style="display:none;">
307
                                                        [% IF NOT bibitemloo.force_hold %]
321
                                                        [% UNLESS bibitemloo.forced_hold_level == 'item' || bibitemloo.forced_hold_level == 'volume' %]
308
                                                            <label class="radio inline" for="reqany_[% bibitemloo.biblionumber | html %]">Next available item</label>
322
                                                            <label class="radio inline" for="reqany_[% bibitemloo.biblionumber | html %]">Next available item</label>
309
                                                            <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
323
                                                            <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
310
                                                                    id="reqany_[% bibitemloo.biblionumber | html %]"
324
                                                                    id="reqany_[% bibitemloo.biblionumber | html %]"
Lines 313-318 Link Here
313
                                                                    checked="checked"
327
                                                                    checked="checked"
314
                                                            />
328
                                                            />
315
                                                        [% END %]
329
                                                        [% END %]
330
316
                                                        <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber | html %]">A specific item</label>
331
                                                        <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber | html %]">A specific item</label>
317
                                                        <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
332
                                                        <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
318
                                                               id="reqspecific_[% bibitemloo.biblionumber | html %]"
333
                                                               id="reqspecific_[% bibitemloo.biblionumber | html %]"
Lines 553-560 Link Here
553
            var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
568
            var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
554
            // If the checkbox is checked AND we want a specific item, we display the items block
569
            // If the checkbox is checked AND we want a specific item, we display the items block
555
            if ( $(checkbox).is(":checked") && select_specific ) {
570
            if ( $(checkbox).is(":checked") && select_specific ) {
571
                if ( $(`#volume_id_${biblioNum}`).length ) {
572
                    $(`#volume_id_${biblioNum}`).val("").attr('disabled', 'disabled');
573
                }
556
                $(newCopiesRowId).show();
574
                $(newCopiesRowId).show();
557
            } else {
575
            } else {
576
                if ( $(`#volume_id_${biblioNum}`).length ) {
577
                    $(`#volume_id_${biblioNum}`).removeAttr('disabled');
578
                }
558
                $(newCopiesRowId).hide();
579
                $(newCopiesRowId).hide();
559
             }
580
             }
560
        };
581
        };
(-)a/opac/opac-reserve.pl (-1 / +8 lines)
Lines 287-292 if ( $query->param('place_reserve') ) { Link Here
287
            $itemNum = undef;
287
            $itemNum = undef;
288
        }
288
        }
289
        my $notes = $query->param('notes_'.$biblioNum)||'';
289
        my $notes = $query->param('notes_'.$biblioNum)||'';
290
        my $volume_id = $query->param("volume_id_$biblioNum") || undef;
290
291
291
        if (   $maxreserves
292
        if (   $maxreserves
292
            && $reserve_cnt >= $maxreserves )
293
            && $reserve_cnt >= $maxreserves )
Lines 313-318 if ( $query->param('place_reserve') ) { Link Here
313
                [$biblioNum],     $rank,           $startdate,
314
                [$biblioNum],     $rank,           $startdate,
314
                $expiration_date, $notes,          $biblioData->{title},
315
                $expiration_date, $notes,          $biblioData->{title},
315
                $itemNum,         $found,          $itemtype,
316
                $itemNum,         $found,          $itemtype,
317
                $volume_id,
316
            );
318
            );
317
            $failed_holds++ unless $reserve_id;
319
            $failed_holds++ unless $reserve_id;
318
            ++$reserve_cnt;
320
            ++$reserve_cnt;
Lines 422-427 foreach my $biblioNum (@biblionumbers) { Link Here
422
    }
424
    }
423
425
424
    my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );
426
    my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );
427
    $biblioLoopIter{object} = $biblio;
425
    $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
428
    $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
426
    $biblioLoopIter{title} = $biblioData->{title};
429
    $biblioLoopIter{title} = $biblioData->{title};
427
    $biblioLoopIter{subtitle} = $biblioData->{'subtitle'};
430
    $biblioLoopIter{subtitle} = $biblioData->{'subtitle'};
Lines 628-634 foreach my $biblioNum (@biblionumbers) { Link Here
628
    )->forced_hold_level();
631
    )->forced_hold_level();
629
    if ($forced_hold_level) {
632
    if ($forced_hold_level) {
630
        $biblioLoopIter{force_hold}   = 1 if $forced_hold_level eq 'item';
633
        $biblioLoopIter{force_hold}   = 1 if $forced_hold_level eq 'item';
634
        $biblioLoopIter{force_hold}   = 0 if $forced_hold_level eq 'volume';
635
631
        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
636
        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
637
        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'volume';
638
639
        $biblioLoopIter{forced_hold_level} = $forced_hold_level;
632
    }
640
    }
633
641
634
642
635
- 

Return to bug 24860