Attachment #113620 for bug #24860

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

Lines 58-63 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (+3 lines)
58	</strong>	58	</strong>
59	[% END %]	59	[% END %]
60	[% HOLD.biblio.author \| html %]	60	[% HOLD.biblio.author \| html %]
		61	[% IF HOLD.volume_id %]
		62	<br/><strong>Next available item from volume <i>[% HOLD.volume.description \| html %]</i></strong>
		63	[% END %]
61	</td>	64	</td>
62	<td class="reservedate">	65	<td class="reservedate">
63	<span title="[% HOLD.reservedate \| html %]">	66	<span title="[% HOLD.reservedate \| html %]">




                                                    </li>
                                                [% END %]

                                                [% UNLESS forced_hold_level && ( forced_hold_level == 'item' || forced_hold_level == 'record' ) %]
                                                    [% IF bibitemloo.object.volumes %]
                                                        <li>
                                                            <label for="itemtype">Request specific volume:</label>
                                                            <select name="volume_id_[% bibitemloo.biblionumber | html %]" id="volume_id_[% bibitemloo.biblionumber | html %]" size="1">
                                                                <option value="">Any volume</option>
                                                                [% FOREACH v IN bibitemloo.object.volumes %]
                                                                    <option value="[% v.id | html %]">[% v.description | html %]</option>
                                                                [% END %]
                                                            </select>
                                                        </li>
                                                    [% END %]
                                                [% END %]

                                                [% IF ( OpacHoldNotes ) %]
                                                    <li>
                                                        <div class="notesrow" id="notesrow_[% bibitemloo.biblionumber | html %]">

                                                [% IF bibitemloo.itemholdable %]
                                                    <!-- ITEM HOLDS -->
                                                    <li class="lradio place_on_type" style="display:none;">
                                                        [% UNLESS bibitemloo.forced_hold_level == 'item' || bibitemloo.forced_hold_level == 'volume' %]
                                                            <label class="radio inline" for="reqany_[% bibitemloo.biblionumber | html %]">Next available item</label>
                                                            <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
                                                                    id="reqany_[% bibitemloo.biblionumber | html %]"

                                                                    checked="checked"
                                                            />
                                                        [% END %]

                                                        <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber | html %]">A specific item</label>
                                                        <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
                                                               id="reqspecific_[% bibitemloo.biblionumber | html %]"

            var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
            // If the checkbox is checked AND we want a specific item, we display the items block
            if ( $(checkbox).is(":checked") && select_specific ) {
                if ( $(`#volume_id_${biblioNum}`).length ) {
                    $(`#volume_id_${biblioNum}`).val("").attr('disabled', 'disabled');
                }
                $(newCopiesRowId).show();
            } else {
                if ( $(`#volume_id_${biblioNum}`).length ) {
                    $(`#volume_id_${biblioNum}`).removeAttr('disabled');
                }
                $(newCopiesRowId).hide();
             }
        };




            $itemNum = undef;
        }
        my $notes = $query->param('notes_'.$biblioNum)||'';
        my $volume_id = $query->param("volume_id_$biblioNum") || undef;

        if (   $maxreserves
            && $reserve_cnt >= $maxreserves )

                    itemnumber       => $itemNum,
                    found            => $found,
                    itemtype         => $itemtype,
                    volume_id        => $volume_id,
                }
            );
            $failed_holds++ unless $reserve_id;

    }

    my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );
    $biblioLoopIter{object} = $biblio;
    $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
    $biblioLoopIter{title} = $biblioData->{title};
    $biblioLoopIter{subtitle} = $biblioData->{'subtitle'};

    )->forced_hold_level();
    if ($forced_hold_level) {
        $biblioLoopIter{force_hold}   = 1 if $forced_hold_level eq 'item';
        $biblioLoopIter{force_hold}   = 0 if $forced_hold_level eq 'volume';

        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'volume';

        $biblioLoopIter{forced_hold_level} = $forced_hold_level;
    }

- 

Return to bug 24860

Lines 306-311 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-1 / +22 lines)
306	</li>	306	</li>
307	[% END %]	307	[% END %]
308		308
		309	[% UNLESS forced_hold_level && ( forced_hold_level == 'item' \|\| forced_hold_level == 'record' ) %]
		310	[% IF bibitemloo.object.volumes %]
		311	<li>
		312	<label for="itemtype">Request specific volume:</label>
		313	<select name="volume_id_[% bibitemloo.biblionumber \| html %]" id="volume_id_[% bibitemloo.biblionumber \| html %]" size="1">
		314	<option value="">Any volume</option>
		315	[% FOREACH v IN bibitemloo.object.volumes %]
		316	<option value="[% v.id \| html %]">[% v.description \| html %]</option>
		317	[% END %]
		318	</select>
		319	</li>
		320	[% END %]
		321	[% END %]
		322
309	[% IF ( OpacHoldNotes ) %]	323	[% IF ( OpacHoldNotes ) %]
310	<li>	324	<li>
311	<div class="notesrow" id="notesrow_[% bibitemloo.biblionumber \| html %]">	325	<div class="notesrow" id="notesrow_[% bibitemloo.biblionumber \| html %]">
Lines 321-327 Link Here
321	[% IF bibitemloo.itemholdable %]	335	[% IF bibitemloo.itemholdable %]
322	<!-- ITEM HOLDS -->	336	<!-- ITEM HOLDS -->
323	<li class="lradio place_on_type" style="display:none;">	337	<li class="lradio place_on_type" style="display:none;">
324	[% IF NOT bibitemloo.force_hold %]	338	[% UNLESS bibitemloo.forced_hold_level == 'item' \|\| bibitemloo.forced_hold_level == 'volume' %]
325	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber \| html %]">Next available item</label>	339	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber \| html %]">Next available item</label>
326	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"	340	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"
327	id="reqany_[% bibitemloo.biblionumber \| html %]"	341	id="reqany_[% bibitemloo.biblionumber \| html %]"
Lines 330-335 Link Here
330	checked="checked"	344	checked="checked"
331	/>	345	/>
332	[% END %]	346	[% END %]
		347
333	<label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber \| html %]">A specific item</label>	348	<label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber \| html %]">A specific item</label>
334	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"	349	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"
335	id="reqspecific_[% bibitemloo.biblionumber \| html %]"	350	id="reqspecific_[% bibitemloo.biblionumber \| html %]"
Lines 570-577 Link Here
570	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");	585	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
571	// If the checkbox is checked AND we want a specific item, we display the items block	586	// If the checkbox is checked AND we want a specific item, we display the items block
572	if ( $(checkbox).is(":checked") && select_specific ) {	587	if ( $(checkbox).is(":checked") && select_specific ) {
		588	if ( $(`#volume_id_${biblioNum}`).length ) {
		589	$(`#volume_id_${biblioNum}`).val("").attr('disabled', 'disabled');
		590	}
573	$(newCopiesRowId).show();	591	$(newCopiesRowId).show();
574	} else {	592	} else {
		593	if ( $(`#volume_id_${biblioNum}`).length ) {
		594	$(`#volume_id_${biblioNum}`).removeAttr('disabled');
		595	}
575	$(newCopiesRowId).hide();	596	$(newCopiesRowId).hide();
576	}	597	}
577	};	598	};

Lines 286-291 if ( $query->param('place_reserve') ) { Link Here

(-)a/opac/opac-reserve.pl (-1 / +7 lines)
286	$itemNum = undef;	286	$itemNum = undef;
287	}	287	}
288	my $notes = $query->param('notes_'.$biblioNum)\|\|'';	288	my $notes = $query->param('notes_'.$biblioNum)\|\|'';
		289	my $volume_id = $query->param("volume_id_$biblioNum") \|\| undef;
289		290
290	if ( $maxreserves	291	if ( $maxreserves
291	&& $reserve_cnt >= $maxreserves )	292	&& $reserve_cnt >= $maxreserves )
Lines 320-325 if ( $query->param('place_reserve') ) { Link Here
320	itemnumber => $itemNum,	321	itemnumber => $itemNum,
321	found => $found,	322	found => $found,
322	itemtype => $itemtype,	323	itemtype => $itemtype,
		324	volume_id => $volume_id,
323	}	325	}
324	);	326	);
325	$failed_holds++ unless $reserve_id;	327	$failed_holds++ unless $reserve_id;
Lines 430-435 foreach my $biblioNum (@biblionumbers) { Link Here
430	}	432	}
431		433
432	my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );	434	my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );
		435	$biblioLoopIter{object} = $biblio;
433	$biblioLoopIter{biblionumber} = $biblioData->{biblionumber};	436	$biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
434	$biblioLoopIter{title} = $biblioData->{title};	437	$biblioLoopIter{title} = $biblioData->{title};
435	$biblioLoopIter{subtitle} = $biblioData->{'subtitle'};	438	$biblioLoopIter{subtitle} = $biblioData->{'subtitle'};
Lines 633-639 foreach my $biblioNum (@biblionumbers) { Link Here
633	)->forced_hold_level();	636	)->forced_hold_level();
634	if ($forced_hold_level) {	637	if ($forced_hold_level) {
635	$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';	638	$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';
		639	$biblioLoopIter{force_hold} = 0 if $forced_hold_level eq 'volume';
		640
636	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';	641	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
		642	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'volume';
		643
637	$biblioLoopIter{forced_hold_level} = $forced_hold_level;	644	$biblioLoopIter{forced_hold_level} = $forced_hold_level;
638	}	645	}
639		646
640	-