gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 20287: Move trim values to a method 

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2018-02-21 17:32:00 -03:00 committed by Nick Clemens
parent 1b13c453e2
commit a6059c4d2d
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Auth_with_ldap.pm
View File

@ -223,7 +223,7 @@ sub checkpw_ldap {
return(1, $cardnumber, $local_userid);
}
} elsif ($config{replicate}) { # A2, C2
$borrowernumber = C4::Members::AddMember(%borrower) or die "AddMember failed";
Koha::Patron->new( \%borrower )->store;
C4::Members::Messaging::SetMessagingPreferencesFromDefaults( { borrowernumber => $borrowernumber, categorycode => $borrower{'categorycode'} } );
} else {
return 0; # B2, D2

7
C4/Members.pm
View File

@ -405,13 +405,6 @@ sub AddMember {
);
}
# trim whitespace from data which has some non-whitespace in it.
foreach my $field_name (keys(%data)) {
if ( defined $data{$field_name} && $data{$field_name} =~ /\S/ ) {
$data{$field_name} =~ s/^\s*|\s*$//g;
}
}
my $p = Koha::Patron->new( { userid => $data{userid}, firstname => $data{firstname}, surname => $data{surname} } );
# generate a proper login if none provided
$data{'userid'} = $p->generate_userid

18
Koha/Patron.pm
View File

@ -104,6 +104,24 @@ sub fixup_cardnumber {
$self->cardnumber($max+1);
}
# trim whitespace from data which has some non-whitespace in it.
# Could be moved to Koha::Object if need to be reused
sub trim_whitespaces {
my( $self ) = @_;
my $schema = Koha::Database->new->schema;
my @columns = $schema->source('Borrowers')->columns;
for my $column( @columns ) {
my $value = $self->$column;
if ( defined $value ) {
$value =~ s/^\s*|\s*$//g;
$self->$column($value);
}
}
return $self;
}
sub store {
my( $self ) = @_;