Attachment 105028 Details for Bug 14708 – Bug 14708: Don't allow merging of Anonymous Patron into other patron records

[patch] Bug 14708: Don't allow merging of Anonymous Patron into other patron records

Bug-14708-Dont-allow-merging-of-Anonymous-Patron-i.patch (text/plain), 2.49 KB, created by Andrew Fuerste-Henry on 2020-05-18 14:39:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Fuerste-Henry

Created: 2020-05-18 14:39:21 UTC

Size: 2.49 KB

patch

obsolete

>From 3c366e739da4f01664ce9b2dba3dbe151b24d043 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 15 Apr 2020 13:48:09 -0400
>Subject: [PATCH] Bug 14708: Don't allow merging of Anonymous Patron into other
> patron records
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>---
> Koha/Patron.pm                | 5 +++++
> t/db_dependent/Koha/Patrons.t | 8 +++++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
>diff --git a/Koha/Patron.pm b/Koha/Patron.pm
>index c359865443..9d47c95ad4 100644
>--- a/Koha/Patron.pm
>+++ b/Koha/Patron.pm
>@@ -567,6 +567,11 @@ sub merge_with {
> 
>     $self->_result->result_source->schema->txn_do( sub {
>         foreach my $patron_id (@patron_ids) {
>+
>+            if ( my $anonymous_patron = C4::Context->preference("AnonymousPatron") ) {
>+                next if $patron_id eq $anonymous_patron;
>+            }
>+
>             my $patron = Koha::Patrons->find( $patron_id );
> 
>             next unless $patron;
>diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t
>index e9ded6d1dd..6feeb150a3 100644
>--- a/t/db_dependent/Koha/Patrons.t
>+++ b/t/db_dependent/Koha/Patrons.t
>@@ -1692,7 +1692,7 @@ subtest 'BorrowersLog tests' => sub {
> $schema->storage->txn_rollback;
> 
> subtest 'Test Koha::Patrons::merge' => sub {
>-    plan tests => 110;
>+    plan tests => 111;
> 
>     my $schema = Koha::Database->new()->schema();
> 
>@@ -1704,6 +1704,10 @@ subtest 'Test Koha::Patrons::merge' => sub {
>     my $loser_1 = $builder->build({ source => 'Borrower' })->{borrowernumber};
>     my $loser_2 = $builder->build({ source => 'Borrower' })->{borrowernumber};
> 
>+    my $anonymous_patron_orig = C4::Context->preference('AnonymousPatron');
>+    my $anonymous_patron = $builder->build({ source => 'Borrower' })->{borrowernumber};
>+    t::lib::Mocks::mock_preference( 'AnonymousPatron', $anonymous_patron );
>+
>     while (my ($r, $field) = each(%$resultsets)) {
>         $builder->build({ source => $r, value => { $field => $keeper->id } });
>         $builder->build({ source => $r, value => { $field => $loser_1 } });
>@@ -1732,7 +1736,9 @@ subtest 'Test Koha::Patrons::merge' => sub {
> 
>     is( Koha::Patrons->find($loser_1), undef, 'Loser 1 has been deleted' );
>     is( Koha::Patrons->find($loser_2), undef, 'Loser 2 has been deleted' );
>+    is( ref Koha::Patrons->find($anonymous_patron), 'Koha::Patron', 'Anonymous Patron was not deleted' );
> 
>+    t::lib::Mocks::mock_preference( 'AnonymousPatron', '' );
>     $schema->storage->txn_rollback;
> };
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 14708: 85766 | 85770 | 85783 | 85789 | 103026 | 103027 | 103028 | 103922 | 105024 | 105025 | 105026 | 105027 | 105028 | 105029 | 105184 | 105185 | 105186 | 105187 | 105188 | 105189 | 112830 | 112831 | 112922 | 113121