Merge remote branch 'kc/new/enh/bug_5462' into kcmaster

This commit is contained in:
Chris Cormack 2011-02-08 21:05:14 +13:00
commit 083fd5776a
4 changed files with 4 additions and 4 deletions

View file

@ -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"),

View file

@ -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) {

View file

@ -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;

View file

@ -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};
}