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

(-)a/Koha/Template/Plugin/Branches.pm (+5 lines)
Lines 75-78 sub all { Link Here
75
    return $libraries;
75
    return $libraries;
76
}
76
}
77
77
78
sub InIndependentBranchesMode {
79
    my ( $self ) = @_;
80
    return ( not C4::Context->preference("IndependentBranches") or C4::Context::IsSuperLibrarian );
81
}
82
78
1;
83
1;
(-)a/circ/branchoverdues.pl (-3 lines)
Lines 159-165 $template->param( Link Here
159
# Checking if there is a Fast Cataloging Framework
159
# Checking if there is a Fast Cataloging Framework
160
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
160
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
161
161
162
# Checking if the transfer page needs to be displayed
163
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
164
165
output_html_with_http_headers $input, $cookie, $template->output;
162
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/circ/branchtransfers.pl (-3 lines)
Lines 240-247 $template->param( Link Here
240
# Checking if there is a Fast Cataloging Framework
240
# Checking if there is a Fast Cataloging Framework
241
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
241
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
242
242
243
# Checking if the transfer page needs to be displayed
244
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
245
246
output_html_with_http_headers $query, $cookie, $template->output;
243
output_html_with_http_headers $query, $cookie, $template->output;
247
244
(-)a/circ/circulation-home.pl (-2 lines)
Lines 37-44 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( Link Here
37
# Checking if there is a Fast Cataloging Framework
37
# Checking if there is a Fast Cataloging Framework
38
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
38
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
39
39
40
# Checking if the transfer page needs to be displayed
41
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
42
$template->{'VARS'}->{'AllowOfflineCirculation'} = C4::Context->preference('AllowOfflineCirculation');
40
$template->{'VARS'}->{'AllowOfflineCirculation'} = C4::Context->preference('AllowOfflineCirculation');
43
41
44
42
(-)a/circ/on-site_checkouts.pl (-2 lines)
Lines 39-46 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here
39
# Checking if there is a Fast Cataloging Framework
39
# Checking if there is a Fast Cataloging Framework
40
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
40
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
41
41
42
# Checking if the transfer page needs to be displayed
43
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
44
42
45
my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts();
43
my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts();
46
44
(-)a/circ/renew.pl (-3 lines)
Lines 121-127 if ($barcode) { Link Here
121
# Checking if there is a Fast Cataloging Framework
121
# Checking if there is a Fast Cataloging Framework
122
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
122
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
123
123
124
# Checking if the transfer page needs to be displayed
125
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
126
127
output_html_with_http_headers( $cgi, $cookie, $template->output );
124
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/circ/returns.pl (-3 lines)
Lines 651-658 if ( $itemnumber ) { Link Here
651
# Checking if there is a Fast Cataloging Framework
651
# Checking if there is a Fast Cataloging Framework
652
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
652
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
653
653
654
# Checking if the transfer page needs to be displayed
655
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
656
657
# actually print the page!
654
# actually print the page!
658
output_html_with_http_headers $query, $cookie, $template->output;
655
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/selectbranchprinter.pl (-3 lines)
Lines 137-143 $template->param( Link Here
137
# Checking if there is a Fast Cataloging Framework
137
# Checking if there is a Fast Cataloging Framework
138
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
138
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
139
139
140
# Checking if the transfer page needs to be displayed
141
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
142
143
output_html_with_http_headers $query, $cookie, $template->output;
140
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/transferstoreceive.pl (-3 lines)
Lines 128-135 $template->param( Link Here
128
# Checking if there is a Fast Cataloging Framework
128
# Checking if there is a Fast Cataloging Framework
129
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
129
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
130
130
131
# Checking if the transfer page needs to be displayed
132
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
133
134
output_html_with_http_headers $input, $cookie, $template->output;
131
output_html_with_http_headers $input, $cookie, $template->output;
135
132
(-)a/circ/view_holdsqueue.pl (-3 lines)
Lines 78-85 $template->param( Link Here
78
# Checking if there is a Fast Cataloging Framework
78
# Checking if there is a Fast Cataloging Framework
79
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
79
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
80
80
81
# Checking if the transfer page needs to be displayed
82
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
83
84
# writing the template
81
# writing the template
85
output_html_with_http_headers $query, $cookie, $template->output;
82
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/circ/waitingreserves.pl (-3 lines)
Lines 167-175 $template->param( Link Here
167
# Checking if there is a Fast Cataloging Framework
167
# Checking if there is a Fast Cataloging Framework
168
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
168
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
169
169
170
# Checking if the transfer page needs to be displayed
171
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );
172
173
if ($item && $tab eq 'holdsover' && !@cancel_result) {
170
if ($item && $tab eq 'holdsover' && !@cancel_result) {
174
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
171
    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
175
} elsif ($cancelall) {
172
} elsif ($cancelall) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (-1 / +2 lines)
Lines 1-3 Link Here
1
[% USE Branches %]
1
<script type="text/javascript">//<![CDATA[
2
<script type="text/javascript">//<![CDATA[
2
    $(document).ready(function() {
3
    $(document).ready(function() {
3
        var path = location.pathname.substring(1);
4
        var path = location.pathname.substring(1);
Lines 23-29 Link Here
23
            <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
24
            <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
24
            <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
25
            <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
25
            <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
26
            <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
26
            [% IF ( display_transfer ) %]
27
            [% IF Branches.InIndependentBranchesMode %]
27
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
28
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
28
            [% END %]
29
            [% END %]
29
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
30
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-2 / +2 lines)
Lines 1-4 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Circulation</title>
4
<title>Koha &rsaquo; Circulation</title>
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
Lines 21-27 Link Here
21
        <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
22
        <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
22
        <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
23
        <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
23
        <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
24
        <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
24
    [% IF ( display_transfer ) %]
25
    [% IF Branches.InIndependentBranchesMode %]
25
		<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
26
		<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
26
    [% END %]
27
    [% END %]
27
    [% UNLESS IndependentBranches %]<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %]
28
    [% UNLESS IndependentBranches %]<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>[% END %]
28
- 

Return to bug 16530