From cc27d3c947045c1713bcffd31aac9bff68bd6a03 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 7 Feb 2011 12:09:45 -0500 Subject: [PATCH] Follow-up correction for Bug 5462 - Fix variable names for template::toolkit Content-Type: text/plain; charset="utf-8" Previous commit modified checks for the item-level_itypes preference to look for a different variable name but didn't update where that variable is set in Auth.pm. Other scripts perform a direct check of item-level_itypes and must continue to use the name of the variable in the database. --- C4/Auth.pm | 2 +- opac/opac-reserve.pl | 2 +- opac/opac-search.pl | 2 +- reserve/request.pl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 130974e..39eb50f 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -332,7 +332,7 @@ sub get_template_and_user { LoginSurname => C4::Context->userenv?C4::Context->userenv->{"surname"}:"Inconnu", TagsEnabled => C4::Context->preference("TagsEnabled"), hide_marc => C4::Context->preference("hide_marc"), - 'item-level_itypes' => C4::Context->preference('item-level_itypes'), + item_level_itypes => C4::Context->preference('item-level_itypes'), patronimages => C4::Context->preference("patronimages"), singleBranchMode => C4::Context->preference("singleBranchMode"), XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"), diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index 3d547b7..f4181d6 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -290,7 +290,7 @@ my $biblioLoop = []; my $numBibsAvailable = 0; my $itemdata_enumchron = 0; my $anyholdable; -my $itemLevelTypes = C4::Context->preference('item_level_itypes'); +my $itemLevelTypes = C4::Context->preference('item-level_itypes'); $template->param('item_level_itypes' => $itemLevelTypes); foreach my $biblioNum (@biblionumbers) { diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 855aa93..0f52650 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -153,7 +153,7 @@ $template->param(search_languages_loop => $languages_limit_loop,); # load the Type stuff my $itemtypes = GetItemTypes; # the index parameter is different for item-level itemtypes -my $itype_or_itemtype = (C4::Context->preference("item_level_itypes"))?'itype':'itemtype'; +my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; my @itemtypesloop; my $selected=1; my $cnt; diff --git a/reserve/request.pl b/reserve/request.pl index a31b6e2..7e51364 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -330,7 +330,7 @@ foreach my $biblionumber (@biblionumbers) { foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } ) { my $item = $iteminfos_of->{$itemnumber}; - unless (C4::Context->preference('item_level_itypes')) { + unless (C4::Context->preference('item-level_itypes')) { $item->{itype} = $biblioitem->{itemtype}; } -- 1.7.3