From 1e2f5a6d3d417e95c224339c871edce3ff5d3701 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Mon, 5 Aug 2019 22:39:37 +0000 Subject: [PATCH] Bug 23431: Don't nullify DOB if it's hidden by sysprefs To test: Turn on OPACPatronDetails put dateofbirth in PatronSelfModificationBorrowerUnwantedField Have a patron with a set date of birth Attempt any modification on that patron through the OPAC The date of birth will be one of the fields changed for that borrower when you check it in the staff intranet. Apply this patch, repeat the above. Date of birth will not be one of the changed fields. Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Martin Renvoize (cherry picked from commit d71b263a89839e3b2f9aa7166dba2657a2aecf14) Signed-off-by: Fridolin Somers (cherry picked from commit 936f1450b802a6d00e6bf681eb60f3844ff865d0) Signed-off-by: Lucas Gass --- opac/opac-memberentry.pl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 180c25d586..ba33fa40b4 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -484,13 +484,17 @@ sub ParseCgiForBorrower { sub DelUnchangedFields { my ( $borrowernumber, %new_data ) = @_; - + # get the mandatory fields so we can get the hidden fields + my $mandatory = GetMandatoryFields('edit'); my $patron = Koha::Patrons->find( $borrowernumber ); my $current_data = $patron->unblessed; + # get the hidden fields so we don't obliterate them should they have data patrons aren't allowed to modify + my $hidden_fields = GetHiddenFields($mandatory, 'edit'); + foreach my $key ( keys %new_data ) { - if ( $current_data->{$key} eq $new_data{$key} ) { - delete $new_data{$key}; + if ( ($current_data->{$key} eq $new_data{$key}) || $hidden_fields->{$key} ) { + delete $new_data{$key}; } } -- 2.39.5