From fb20bea31e0bba7c863077493be167db18b2ed83 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 18 Dec 2019 14:04:58 +0100 Subject: [PATCH] Bug 24263: Replace borrowers.relationship with NULL when was empty string When you create a new patron, its relationship field is populated with an empty string when we are expecting NULL. Otherwise the about page will display a warning about a missing/wrong relationship in data (that is not in the syspref) Test plan: 0/ Do not apply the patches from this bug report 1/ Create a new patron (child) 2/ Notice that relationship column in DB is set to an empty string 3/ Go to the about page, notice the invalid warning about relationship values not in the syspref 4/ Apply DB changes and tests 5/ Execute the update DB entry => The value in DB is now NULL when was "" 6/ Execute the tests => It fails 7/ Apply the last patch 8/ Add and edit a patron (child) => relationship is set to NULL in DB 9/ Execute the tests => They pass! Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson --- Koha/Patron.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Koha/Patron.pm b/Koha/Patron.pm index 8e501fcfb1..46a5bd4bca 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -199,6 +199,10 @@ sub store { $self->surname( uc($self->surname) ) if C4::Context->preference("uppercasesurnames"); + $self->relationship(undef) # We do not want to store an empty string in this field + if defined $self->relationship + and $self->relationship eq ""; + unless ( $self->in_storage ) { #AddMember # Generate a valid userid/login if needed -- 2.39.5