From c69c87cb49da5e42121df63b772139cf44942a93 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 16 Sep 2022 08:58:51 +0000 Subject: [PATCH] Bug 31154: (QA follow-up) Fix UI form builder The change in batchMod.pl is not needed when we fix the builder. But we could at least add a comment there! Note that passing the biblionumber of the first item does not make sense since we are modifying items from several biblio records normally. We most probably do not want this MARC record's itemcallnumber (via the syspref) in all our items. Test plan: Test batchMod with and without the Populate fields checkbox. Fill syspref 'itemcallnumber' with e.g. 084a. Check Populate, and try again. Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit eb292431401a7ed0782427412eb1208fa7716e4c) Signed-off-by: Lucas Gass (cherry picked from commit e5c11f993369cbcd2507a604fece7254263f8ac0) Signed-off-by: Arthur Suzuki --- Koha/UI/Form/Builder/Item.pm | 6 +++--- tools/batchMod.pl | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Koha/UI/Form/Builder/Item.pm b/Koha/UI/Form/Builder/Item.pm index 59274aecb0..18b010fc76 100644 --- a/Koha/UI/Form/Builder/Item.pm +++ b/Koha/UI/Form/Builder/Item.pm @@ -161,7 +161,7 @@ sub generate_subfield_form { my $CNsubfields = substr( $pref_itemcallnumber_part, 3 ); # Any and all subfields $CNsubfields = undef if $CNsubfields eq ''; - my $temp2 = $marc_record->field($CNtag); + my $temp2 = $marc_record ? $marc_record->field($CNtag) : undef; next unless $temp2; $value = $temp2->as_string( $CNsubfields, ' ' ); @@ -313,7 +313,7 @@ sub generate_subfield_form { ); my $pars = { dbh => $dbh, - record => $marc_record, + record => $marc_record, #Note: could be undefined tagslib => $tagslib, id => $subfield_data{id}, }; @@ -562,7 +562,7 @@ sub edit_form { value => $value, tagslib => $tagslib, libraries => $libraries, - marc_record => $marc_record, + marc_record => $marc_record, #Note: could be undefined restricted_edition => $restricted_edition, prefill_with_default_values => $prefill_with_default_values, branch_limit => $branch_limit, diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 6f4f4dfcf3..bc0944fced 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -266,9 +266,7 @@ if ($op eq "show"){ # Getting list of subfields to keep when restricted batchmod edit is enabled my @subfields_to_allow = $restrictededition ? split ' ', C4::Context->preference('SubfieldsToAllowForRestrictedBatchmod') : (); - $biblionumber = Koha::Items->find($itemnumbers[0])->unblessed->{biblionumber} if $itemnumbers[0]; - my $subfields = Koha::UI::Form::Builder::Item->new( - { biblionumber => $biblionumber } )->edit_form( + my $subfields = Koha::UI::Form::Builder::Item->new->edit_form( # NOTE: We are not passing a biblionumber intentionally ! { restricted_editition => $restrictededition, ( -- 2.39.5