From fa390ca232a0979c6786a0e00eca8d458f644f3e Mon Sep 17 00:00:00 2001 From: Arthur Suzuki Date: Tue, 25 Jun 2019 11:17:24 +0200 Subject: [PATCH] Bug 23199: Koha::Patron->store must check 'uppercasesurname' syspref Test plan: 1/ set uppercasesurname to 'Do' 2/ register a new patron using the REST API with lowercase surname 3/ verify the surname is not saved in uppercase 4/ apply patch 5/ repeat 2 6/ verify the surname now is saved to uppercase Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize --- Koha/Patron.pm | 4 ++++ members/memberentry.pl | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Koha/Patron.pm b/Koha/Patron.pm index b1d9b14620..bde22cdd5a 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -193,6 +193,10 @@ sub store { $self->trim_whitespaces; + # Set surname to uppercase if uppercasesurname is true + $self->surname( uc($self->surname) ) + if C4::Context->preference("uppercasesurname"); + unless ( $self->in_storage ) { #AddMember # Generate a valid userid/login if needed diff --git a/members/memberentry.pl b/members/memberentry.pl index bd86e36b67..18f3a96466 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -343,10 +343,6 @@ if ($op eq 'save' || $op eq 'insert'){ } } - if($newdata{surname} && C4::Context->preference('uppercasesurnames')) { - $newdata{'surname'} = uc($newdata{'surname'}); - } - if (C4::Context->preference("IndependentBranches")) { unless ( C4::Context->IsSuperLibrarian() ){ $debug and print STDERR " $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch}; -- 2.39.5