From 796379697849d6ca0364a736aa72dfecf28134e6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 1 Feb 2017 17:54:43 +0100 Subject: [PATCH] Bug 16530: Add a new method to the Branches TT Plugin to avoid c/p We should do the same for the other check (FA exists), but cannot find a good and quick way to implement. Doing it this way will avoid regression later, we will no have to check if the variable is correctly passed to the template. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- Koha/Template/Plugin/Branches.pm | 5 +++++ circ/branchoverdues.pl | 3 --- circ/branchtransfers.pl | 3 --- circ/circulation-home.pl | 2 -- circ/on-site_checkouts.pl | 2 -- circ/renew.pl | 3 --- circ/returns.pl | 3 --- circ/selectbranchprinter.pl | 3 --- circ/transferstoreceive.pl | 3 --- circ/view_holdsqueue.pl | 3 --- circ/waitingreserves.pl | 3 --- koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 3 ++- 13 files changed, 9 insertions(+), 30 deletions(-) diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm index 3d17edc53b..edbad11b02 100644 --- a/Koha/Template/Plugin/Branches.pm +++ b/Koha/Template/Plugin/Branches.pm @@ -75,4 +75,9 @@ sub all { return $libraries; } +sub InIndependentBranchesMode { + my ( $self ) = @_; + return ( not C4::Context->preference("IndependentBranches") or C4::Context::IsSuperLibrarian ); +} + 1; diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl index fe96caac2c..f334dd1a02 100755 --- a/circ/branchoverdues.pl +++ b/circ/branchoverdues.pl @@ -159,7 +159,4 @@ $template->param( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl index 64a5c10472..0022e27e53 100755 --- a/circ/branchtransfers.pl +++ b/circ/branchtransfers.pl @@ -240,8 +240,5 @@ $template->param( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - output_html_with_http_headers $query, $cookie, $template->output; diff --git a/circ/circulation-home.pl b/circ/circulation-home.pl index 4f29f49fac..7d24d79663 100755 --- a/circ/circulation-home.pl +++ b/circ/circulation-home.pl @@ -37,8 +37,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); $template->{'VARS'}->{'AllowOfflineCirculation'} = C4::Context->preference('AllowOfflineCirculation'); diff --git a/circ/on-site_checkouts.pl b/circ/on-site_checkouts.pl index cf630c9cdb..aac5e79064 100755 --- a/circ/on-site_checkouts.pl +++ b/circ/on-site_checkouts.pl @@ -39,8 +39,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts(); diff --git a/circ/renew.pl b/circ/renew.pl index d68247e27c..246c26629f 100755 --- a/circ/renew.pl +++ b/circ/renew.pl @@ -121,7 +121,4 @@ if ($barcode) { # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - output_html_with_http_headers( $cgi, $cookie, $template->output ); diff --git a/circ/returns.pl b/circ/returns.pl index 1409fe7a8e..6e27645c2b 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -652,8 +652,5 @@ if ( $itemnumber ) { # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - # actually print the page! output_html_with_http_headers $query, $cookie, $template->output; diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl index cf0af68344..8099a38466 100755 --- a/circ/selectbranchprinter.pl +++ b/circ/selectbranchprinter.pl @@ -137,7 +137,4 @@ $template->param( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - output_html_with_http_headers $query, $cookie, $template->output; diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl index 3f89f59c43..20f14d11a3 100755 --- a/circ/transferstoreceive.pl +++ b/circ/transferstoreceive.pl @@ -128,8 +128,5 @@ $template->param( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl index 6738c70f0e..72457e03a3 100755 --- a/circ/view_holdsqueue.pl +++ b/circ/view_holdsqueue.pl @@ -78,8 +78,5 @@ $template->param( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - # writing the template output_html_with_http_headers $query, $cookie, $template->output; diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 6f12376046..d0b3942d45 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -167,9 +167,6 @@ $template->param( # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); -# Checking if the transfer page needs to be displayed -$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) ); - if ($item && $tab eq 'holdsover' && !@cancel_result) { print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover"); } elsif ($cancelall) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc index 7bcd94c5d9..844926c83a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc @@ -1,3 +1,4 @@ +[% USE Branches %]