Attachment #78548 for bug #7534

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

Lines 221-227 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-2 / +2 lines)
221		221
222		222
223	[% UNLESS ( singleBranchMode ) %]	223	[% UNLESS ( singleBranchMode ) %]
224	[% IF ( bibitemloo.holdable && choose_branch ) %]	224	[% IF ( bibitemloo.holdable && Koha.Preference('OPACAllowUserToChooseBranch')) %]
225	<li class="branch">	225	<li class="branch">
226	<label for="branch_[% bibitemloo.biblionumber \| html %]">Pick up location:</label>	226	<label for="branch_[% bibitemloo.biblionumber \| html %]">Pick up location:</label>
227	[% UNLESS ( bibitemloo.holdable ) %]	227	[% UNLESS ( bibitemloo.holdable ) %]
Lines 248-254 Link Here
248	[% END %]	248	[% END %]
249	[% END # / UNLESS bibitemloo.holdable %]	249	[% END # / UNLESS bibitemloo.holdable %]
250	</li>	250	</li>
251	[% END # / IF bibitemloo.holdable && choose_branch %]	251	[% END # / IF bibitemloo.holdable && Koha.Preference('OPACAllowUserToChooseBranch') %]
252	[% END # / UNLESS singleBranchMode %]	252	[% END # / UNLESS singleBranchMode %]
253	</ul>	253	</ul>
254		254




my $branch = $query->param('branch') || $patron->branchcode || C4::Context->userenv->{branch} || '' ;
$template->param( branch => $branch );

# Is the person allowed to choose their branch
my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;

$template->param( choose_branch => $OPACChooseBranch);

#
#
# Build hashes of the requested biblio(item)s and items.

        my $canreserve = 0;

        my $singleBranchMode = Koha::Libraries->search->count == 1;
        if ( $singleBranchMode || ! C4::Context->preference("OPACAllowUserToChooseBranch") )
        {    # single branch mode or disabled user choosing
            $branch = $patron->branchcode;
        }
- 

Return to bug 7534

Lines 140-150 if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) { Link Here

(-)a/opac/opac-reserve.pl (-7 / +1 lines)
140	my $branch = $query->param('branch') \|\| $patron->branchcode \|\| C4::Context->userenv->{branch} \|\| '' ;	140	my $branch = $query->param('branch') \|\| $patron->branchcode \|\| C4::Context->userenv->{branch} \|\| '' ;
141	$template->param( branch => $branch );	141	$template->param( branch => $branch );
142		142
143	# Is the person allowed to choose their branch
144	my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;
145
146	$template->param( choose_branch => $OPACChooseBranch);
147
148	#	143	#
149	#	144	#
150	# Build hashes of the requested biblio(item)s and items.	145	# Build hashes of the requested biblio(item)s and items.
Lines 240-246 if ( $query->param('place_reserve') ) { Link Here
240	my $canreserve = 0;	235	my $canreserve = 0;
241		236
242	my $singleBranchMode = Koha::Libraries->search->count == 1;	237	my $singleBranchMode = Koha::Libraries->search->count == 1;
243	if ( $singleBranchMode \|\| !$OPACChooseBranch )	238	if ( $singleBranchMode \|\| ! C4::Context->preference("OPACAllowUserToChooseBranch") )
244	{ # single branch mode or disabled user choosing	239	{ # single branch mode or disabled user choosing
245	$branch = $patron->branchcode;	240	$branch = $patron->branchcode;
246	}	241	}
247	-