Bugzilla – Attachment 21008 Details for
Bug 8836
Resurrect Rotating Collections
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8836 - Resurrect Rotating Collections
Bug-8836---Resurrect-Rotating-Collections.patch (text/plain), 2.74 KB, created by
Kyle M Hall (khall)
on 2013-09-12 12:06:11 UTC
(
hide
)
Description:
Bug 8836 - Resurrect Rotating Collections
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-09-12 12:06:11 UTC
Size:
2.74 KB
patch
obsolete
>From 4f7719ec4dc81e747f3f87ca9ea18fc8100ca969 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 27 Sep 2012 10:39:59 -0400 >Subject: [PATCH] Bug 8836 - Resurrect Rotating Collections > >Signed-off-by: jmbroust <jean-manuel.broust@univ-lyon2.fr> >--- > 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 618190b..fa014ea 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -541,20 +541,16 @@ $template->param( > BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"), > ); > >-### 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 4fff721..152b228 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 >@@ -137,12 +137,10 @@ > <dd>Enter a barcode to generate a printable spine label. For use with dedicated label printers</dd> > [% END %] > >-<!-- > [% IF ( CAN_user_tools_rotating_collections ) %] > <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt> > <dd>Manage Rotating Collections</dd> > [% END %] >---> > > [% IF ( CAN_user_tools_stage_marc_import ) %] > <dt><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a></dt> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8836
:
12560
|
16746
|
19118
|
19119
|
19337
|
19339
|
21008
|
21009
|
21010
|
21011
|
23966
|
23967
|
23968
|
23969
|
23970
|
23971
|
23976
|
28140
|
28141
|
30838
|
30921
|
31087
|
32361
|
32362
|
32588
|
32589
|
32690
|
32691
|
32693
|
32773
|
32774
|
32973
|
32974
|
32975
|
32976
|
32994
|
32999
|
33000
|
33001
|
33002
|
33045
|
33046
|
33047
|
33048
|
33050
|
33051
|
33058
|
33059
|
33060
|
33061
|
33062
|
33063
|
33064
|
33065
|
33066
|
33068
|
33070
|
33095
|
33096
|
33097
|
33098
|
33099
|
33100
|
33101
|
33102
|
33103
|
33330
|
33331
|
33374