Attachment #101831 for bug #24860

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

Lines 63-68 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (+3 lines)
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 %]">




                                                    </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 300-305 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-1 / +22 lines)
300	</li>	300	</li>
301	[% END %]	301	[% END %]
302		302
		303	[% UNLESS forced_hold_level && ( forced_hold_level == 'item' \|\| forced_hold_level == 'record' ) %]
		304	[% IF bibitemloo.object.volumes %]
		305	<li>
		306	<label for="itemtype">Request specific volume:</label>
		307	<select name="volume_id_[% bibitemloo.biblionumber \| html %]" id="volume_id_[% bibitemloo.biblionumber \| html %]" size="1">
		308	<option value="">Any volume</option>
		309	[% FOREACH v IN bibitemloo.object.volumes %]
		310	<option value="[% v.id \| html %]">[% v.description \| html %]</option>
		311	[% END %]
		312	</select>
		313	</li>
		314	[% END %]
		315	[% END %]
		316
303	[% IF ( OpacHoldNotes ) %]	317	[% IF ( OpacHoldNotes ) %]
304	<li>	318	<li>
305	<div class="notesrow" id="notesrow_[% bibitemloo.biblionumber \| html %]">	319	<div class="notesrow" id="notesrow_[% bibitemloo.biblionumber \| html %]">
Lines 315-321 Link Here
315	[% IF bibitemloo.itemholdable %]	329	[% IF bibitemloo.itemholdable %]
316	<!-- ITEM HOLDS -->	330	<!-- ITEM HOLDS -->
317	<li class="lradio place_on_type" style="display:none;">	331	<li class="lradio place_on_type" style="display:none;">
318	[% IF NOT bibitemloo.force_hold %]	332	[% UNLESS bibitemloo.forced_hold_level == 'item' \|\| bibitemloo.forced_hold_level == 'volume' %]
319	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber \| html %]">Next available item</label>	333	<label class="radio inline" for="reqany_[% bibitemloo.biblionumber \| html %]">Next available item</label>
320	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"	334	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"
321	id="reqany_[% bibitemloo.biblionumber \| html %]"	335	id="reqany_[% bibitemloo.biblionumber \| html %]"
Lines 324-329 Link Here
324	checked="checked"	338	checked="checked"
325	/>	339	/>
326	[% END %]	340	[% END %]
		341
327	<label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber \| html %]">A specific item</label>	342	<label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber \| html %]">A specific item</label>
328	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"	343	<input type="radio" name="reqtype_[% bibitemloo.biblionumber \| html %]"
329	id="reqspecific_[% bibitemloo.biblionumber \| html %]"	344	id="reqspecific_[% bibitemloo.biblionumber \| html %]"
Lines 564-571 Link Here
564	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");	579	var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
565	// If the checkbox is checked AND we want a specific item, we display the items block	580	// If the checkbox is checked AND we want a specific item, we display the items block
566	if ( $(checkbox).is(":checked") && select_specific ) {	581	if ( $(checkbox).is(":checked") && select_specific ) {
		582	if ( $(`#volume_id_${biblioNum}`).length ) {
		583	$(`#volume_id_${biblioNum}`).val("").attr('disabled', 'disabled');
		584	}
567	$(newCopiesRowId).show();	585	$(newCopiesRowId).show();
568	} else {	586	} else {
		587	if ( $(`#volume_id_${biblioNum}`).length ) {
		588	$(`#volume_id_${biblioNum}`).removeAttr('disabled');
		589	}
569	$(newCopiesRowId).hide();	590	$(newCopiesRowId).hide();
570	}	591	}
571	};	592	};

Lines 287-292 if ( $query->param('place_reserve') ) { Link Here

(-)a/opac/opac-reserve.pl (-1 / +7 lines)
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 321-326 if ( $query->param('place_reserve') ) { Link Here
321	itemnumber => $itemNum,	322	itemnumber => $itemNum,
322	found => $found,	323	found => $found,
323	itemtype => $itemtype,	324	itemtype => $itemtype,
		325	volume_id => $volume_id,
324	}	326	}
325	);	327	);
326	$failed_holds++ unless $reserve_id;	328	$failed_holds++ unless $reserve_id;
Lines 431-436 foreach my $biblioNum (@biblionumbers) { Link Here
431	}	433	}
432		434
433	my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );	435	my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );
		436	$biblioLoopIter{object} = $biblio;
434	$biblioLoopIter{biblionumber} = $biblioData->{biblionumber};	437	$biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
435	$biblioLoopIter{title} = $biblioData->{title};	438	$biblioLoopIter{title} = $biblioData->{title};
436	$biblioLoopIter{subtitle} = $biblioData->{'subtitle'};	439	$biblioLoopIter{subtitle} = $biblioData->{'subtitle'};
Lines 637-643 foreach my $biblioNum (@biblionumbers) { Link Here
637	)->forced_hold_level();	640	)->forced_hold_level();
638	if ($forced_hold_level) {	641	if ($forced_hold_level) {
639	$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';	642	$biblioLoopIter{force_hold} = 1 if $forced_hold_level eq 'item';
		643	$biblioLoopIter{force_hold} = 0 if $forced_hold_level eq 'volume';
		644
640	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';	645	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
		646	$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'volume';
		647
641	$biblioLoopIter{forced_hold_level} = $forced_hold_level;	648	$biblioLoopIter{forced_hold_level} = $forced_hold_level;
642	}	649	}
643		650
644	-