View | Details | Raw Unified | Return to bug 14708
Collapse All | Expand All

(-)a/Koha/Patron.pm (+5 lines)
Lines 549-554 sub merge_with { Link Here
549
549
550
    $self->_result->result_source->schema->txn_do( sub {
550
    $self->_result->result_source->schema->txn_do( sub {
551
        foreach my $patron_id (@patron_ids) {
551
        foreach my $patron_id (@patron_ids) {
552
553
            if ( my $anonymous_patron = C4::Context->preference("AnonymousPatron") ) {
554
                next if $patron_id eq $anonymous_patron;
555
            }
556
552
            my $patron = Koha::Patrons->find( $patron_id );
557
            my $patron = Koha::Patrons->find( $patron_id );
553
558
554
            next unless $patron;
559
            next unless $patron;
(-)a/t/db_dependent/Koha/Patrons.t (-2 / +7 lines)
Lines 1680-1686 subtest 'BorrowersLog tests' => sub { Link Here
1680
$schema->storage->txn_rollback;
1680
$schema->storage->txn_rollback;
1681
1681
1682
subtest 'Test Koha::Patrons::merge' => sub {
1682
subtest 'Test Koha::Patrons::merge' => sub {
1683
    plan tests => 110;
1683
    plan tests => 111;
1684
1684
1685
    my $schema = Koha::Database->new()->schema();
1685
    my $schema = Koha::Database->new()->schema();
1686
1686
Lines 1692-1697 subtest 'Test Koha::Patrons::merge' => sub { Link Here
1692
    my $loser_1 = $builder->build({ source => 'Borrower' })->{borrowernumber};
1692
    my $loser_1 = $builder->build({ source => 'Borrower' })->{borrowernumber};
1693
    my $loser_2 = $builder->build({ source => 'Borrower' })->{borrowernumber};
1693
    my $loser_2 = $builder->build({ source => 'Borrower' })->{borrowernumber};
1694
1694
1695
    my $anonymous_patron_orig = C4::Context->preference('AnonymousPatron');
1696
    my $anonymous_patron = $builder->build({ source => 'Borrower' })->{borrowernumber};
1697
    t::lib::Mocks::mock_preference( 'AnonymousPatron', $anonymous_patron );
1698
1695
    while (my ($r, $field) = each(%$resultsets)) {
1699
    while (my ($r, $field) = each(%$resultsets)) {
1696
        $builder->build({ source => $r, value => { $field => $keeper->id } });
1700
        $builder->build({ source => $r, value => { $field => $keeper->id } });
1697
        $builder->build({ source => $r, value => { $field => $loser_1 } });
1701
        $builder->build({ source => $r, value => { $field => $loser_1 } });
Lines 1720-1726 subtest 'Test Koha::Patrons::merge' => sub { Link Here
1720
1724
1721
    is( Koha::Patrons->find($loser_1), undef, 'Loser 1 has been deleted' );
1725
    is( Koha::Patrons->find($loser_1), undef, 'Loser 1 has been deleted' );
1722
    is( Koha::Patrons->find($loser_2), undef, 'Loser 2 has been deleted' );
1726
    is( Koha::Patrons->find($loser_2), undef, 'Loser 2 has been deleted' );
1727
    is( ref Koha::Patrons->find($anonymous_patron), 'Koha::Patron', 'Anonymous Patron was not deleted' );
1723
1728
1729
    t::lib::Mocks::mock_preference( 'AnonymousPatron', '' );
1724
    $schema->storage->txn_rollback;
1730
    $schema->storage->txn_rollback;
1725
};
1731
};
1726
1732
1727
- 

Return to bug 14708