Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_8781' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2012-12-02 09:27:26 -05:00
commit 50ea8cfdcf
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
circ/circulation-home.pl
View file

@ -25,7 +25,7 @@ use C4::Context;
use C4::Koha;
my $query = new CGI;
my ($template, $loggedinuser, $cookie)
my ($template, $loggedinuser, $cookie, $flags)
= get_template_and_user({template_name => "circ/circulation-home.tmpl",
query => $query,
type => "intranet",
@ -37,5 +37,8 @@ my ($template, $loggedinuser, $cookie)
my $fa = getframeworkinfo('FA');
$template->param( fast_cataloging => 1 ) if (defined $fa);
# Checking if the transfer page needs to be displayed
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependantBranches") == 0) );
output_html_with_http_headers $query, $cookie, $template->output;

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
View file

@ -19,7 +19,9 @@
<ul>
<li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
<li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
[% IF ( display_transfer ) %]
<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
[% END %]
[% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependantBranches ) %][% ELSE %]<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %][% END %]
[% IF ( fast_cataloging ) %]
[% IF ( CAN_user_editcatalogue_fast_cataloging ) %]