From 3a4585d85dd1cf7d0380d29bf7cebe1c81320ec6 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 27 Mar 2013 09:18:24 -0400 Subject: [PATCH] Bug 9902 - item subfields not populating in 3.10 Test Plan: 1) Create a new serial with a default location, call number, and library ( the library will need to be any but the one you are logged in as ) 2) Click the "Recieve" button for this serial 3) Click "Click to add item" 4) Note those values are not populated 5) Apply the patch 6) Reload the page 7) Click "Click to add item" 8) Note those values are now populated Signed-off-by: Nicole C. Engard All tests pass! --- C4/Items.pm | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 6533a68..a9f26be 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -2655,9 +2655,8 @@ sub PrepareItemrecordDisplay { if ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' && $defaultvalues && $defaultvalues->{'callnumber'} ) { - if( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ){ + $defaultvalue = $defaultvalues->{callnumber}; - } } if ( ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.holdingbranch' || $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.homebranch' ) && $defaultvalues @@ -2670,9 +2669,7 @@ sub PrepareItemrecordDisplay { && $defaultvalues && $defaultvalues->{'location'} ) { - if ( $itemrecord and $defaultvalues and not $itemrecord->field($subfield) ) { $defaultvalue = $defaultvalues->{location}; - } } if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { my @authorised_values; @@ -2701,7 +2698,7 @@ sub PrepareItemrecordDisplay { $authorised_lib{$branchcode} = $branchname; } } - $defaultvalue = C4::Context->userenv->{branch}; + $defaultvalue = $defaultvalues->{branchcode} || C4::Context->userenv->{branch}; #----- itemtypes } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) { @@ -2727,6 +2724,8 @@ sub PrepareItemrecordDisplay { $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'}; } + $defaultvalue = $default_source; + #---- "true" authorised value } else { $authorised_values_sth->execute( -- 1.7.2.5