defer rotating collections

Disabling rotating collections for 3.2.0 release; after more testing,
candidate for 3.4 as well as backport into 3.2.1.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/circ/returns.pl b/circ/returns.pl
index 2611099..51ac9de 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -554,16 +554,20 @@ $template->param(
     soundon        => C4::Context->preference("SoundOn"),
 );
 
-my $itemnumber = GetItemnumberFromBarcode( $query->param('barcode') );
-if ( $itemnumber ) {
-    my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
-    if ( ! ( $holdingBranch eq $collectionBranch ) ) {
-        $template->param(
-          collectionItemNeedsTransferred => 1,
-          collectionBranch => GetBranchName($collectionBranch),
-        );
-    }
-}                                                                                                            
+### 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),
+#        );
+#    }
+#}                                                                                                            
 
 # actually print the page!
 output_html_with_http_headers $query, $cookie, $template->output;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index e926358..bc7c7e7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -59,9 +59,11 @@
        <li><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></li>
        <li><a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a></li>
     <!-- /TMPL_IF -->
+<!--
     <!-- TMPL_IF NAME="CAN_user_tools_rotating_collections" -->
     <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li>
     <!-- /TMPL_IF -->
+-->
     <!-- TMPL_IF NAME="CAN_user_tools_stage_marc_import" -->
        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC for import</a></li>
     <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index d081021..6b11e2f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -123,10 +123,12 @@
     <dd>Enter a barcode to generate a printable spine label. For use with dedicated label printers</dd>
     <!-- /TMPL_IF -->
 
+<!--
     <!-- TMPL_IF NAME="CAN_user_tools_rotating_collections" -->
     <dt><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></dt>
        <dd>Manage Rotating Collections</dd>
     <!-- /TMPL_IF -->
+-->
 
     <!-- TMPL_IF NAME="CAN_user_tools_stage_marc_import" -->
     <dt><a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a></dt>