From 3b9f1e1560d4cf565f48a4cd09d048b2ee38689e Mon Sep 17 00:00:00 2001 From: Didier Gautheron Date: Thu, 5 Nov 2020 15:04:41 +0100 Subject: [PATCH] Bug 26940: don't reset debarredcomment on patron update Test plan: 1) Create a patron 2) In koha/members/moremember.pl add a manual restriction, with comment foobar 3) try to checkout, you have a message like Restricted: Patron's account is restricted with the explanation: foobar 4) Got to Edit patron, save 5) try to checkout, foobar is no more Restricted: Patron's account is restricted with the explanation: 6) Apply patch 7) Redo 1-4 8) try to checkout, foobar is there. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Katariina Hanhisalo Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart --- members/memberentry.pl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 6aad0c0dc4..6511a0805f 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -243,7 +243,7 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) qr/^\d+-DAYS/, qr/^patron_attr_/, qr/^csrf_token$/, - qr/^add_debarment$/, qr/^debarred_expiration$/, qr/^remove_debarment$/, # We already dealt with debarments previously + qr/^add_debarment$/, qr/^debarred_comment$/,qr/^debarred_expiration$/, qr/^remove_debarment$/, # We already dealt with debarments previously qr/^housebound_chooser$/, qr/^housebound_deliverer$/, qr/^select_city$/, qr/^new_guarantor_/, @@ -530,8 +530,6 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ delete $newdata{'B_email'}; } - $newdata{debarredcomment} = $newdata{debarred_comment}; - delete $newdata{debarred_comment}; delete $newdata{password2}; eval { -- 2.39.5