From 08efcd3438275608d4ab08c2ef50fc84c34c5a5d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 27 Sep 2012 10:39:59 -0400 Subject: [PATCH] Bug 8836 - Resurrect Rotating Collections Content-Type: text/plain; charset="utf-8" --- circ/returns.pl | 24 ++++++++----------- .../prog/en/modules/tools/tools-home.tt | 2 - 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index 743bf18..30cba97 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -612,20 +612,16 @@ $template->param( soundon => C4::Context->preference("SoundOn"), ); -### Comment out rotating collections for now to allow it a little more time to bake -### for 3.4; in particular, must ensure that it doesn't fight with transfers required -### to fill hold requests -### -- Galen Charlton 2010-10-06 -#my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') ); -#if ( $itemnumber ) { -# my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); -# if ( ! ( $holdingBranch eq $collectionBranch ) ) { -# $template->param( -# collectionItemNeedsTransferred => 1, -# collectionBranch => GetBranchName($collectionBranch), -# ); -# } -#} +my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') ); +if ( $itemnumber ) { + my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); + if ( ! ( $holdingBranch eq $collectionBranch ) ) { + $template->param( + collectionItemNeedsTransferred => 1, + collectionBranch => GetBranchName($collectionBranch), + ); + } +} # actually print the page! output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 52cc1e6..00b109e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -132,12 +132,10 @@
Enter a barcode to generate a printable spine label. For use with dedicated label printers
[% END %] - [% IF ( CAN_user_tools_stage_marc_import ) %]
Stage MARC records for import
-- 1.7.2.5