From 4a6ae51f362ccba6ff957d76fc124c3562b5a78f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 7 Jun 2022 11:27:04 +0200 Subject: [PATCH] Bug 30909: Retain permanent_location if mapped If items.permanent_location is mapped to a MARC subfields we must retain the value, not using items.location Test plan: 1 - Map permanent_location to a marc field 2 - Expose that field in the item editor 3 - Change the location of the item and retain the permanent location on saving 4 - note that permanent location has not changed Test the different other situation, when adding and editing: Empty the field, change only location, change only permanent_location, etc. Signed-off-by: andrew --- cataloguing/additem.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 7cf5c03660..71cdca7c7e 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -208,8 +208,11 @@ if ($op eq "additem") { my @v = grep { $_ ne "" } uniq $input->multi_param( "items." . $c ); - next if !@v - && $c ne 'permanent_location'; # See 27837 + next unless @v; + + if ( $c eq 'permanent_location' ) { # See 27837 + $item->make_column_dirty('permanent_location'); + } $item->$c(join ' | ', @v); } @@ -477,6 +480,10 @@ if ($op eq "additem") { my @v = map { ( defined $_ && $_ eq '' ) ? undef : $_ } $input->multi_param( "items." . $c ); next unless @v; + if ( $c eq 'permanent_location' ) { # See 27837 + $item->make_column_dirty('permanent_location'); + } + if ( scalar(@v) == 1 && not defined $v[0] ) { delete $new_values->{$c}; } else { -- 2.30.2