From 9a0725e03b952673c4e7cdeba021015c747a1159 Mon Sep 17 00:00:00 2001 From: Arthur Suzuki Date: Tue, 25 Jun 2019 11:45:21 +0200 Subject: [PATCH] Bug 23199 : move uppercasesurname from memberentry.pl to Koha::Patron In memberentry.pl uppercasesurname transform is applied both on patron creation and update (save || insert). Therefore I moved the transformation a bit earlier in Koha::Patron so that it's apply both in "AddMember" and "ModMember" Same test plan applies --- Koha/Patron.pm | 8 ++++---- members/memberentry.pl | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Koha/Patron.pm b/Koha/Patron.pm index 30e3d052f9..30d5038536 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -193,11 +193,11 @@ sub store { $self->trim_whitespaces; - unless ( $self->in_storage ) { #AddMember + # Set surname to uppercase if uppercasesurname is true + $self->surname( uc($self->surname) ) + if C4::Context->preference("uppercasesurname"); - # 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 $self->generate_userid diff --git a/members/memberentry.pl b/members/memberentry.pl index 166302006b..442be451b3 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.11.0