Attachment 72151 Details for Bug 19936 – Bug 19936: (follow-up) Replace Check_userid - Update the occurrences

[patch] Bug 19936: (follow-up) Replace Check_userid - Update the occurrences

Bug-19936-follow-up-Replace-Checkuserid---Update-t.patch (text/plain), 1.43 KB, created by Jonathan Druart on 2018-02-23 17:18:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-02-23 17:18:09 UTC

Size: 1.43 KB

patch

obsolete

>From 6f24f7013410cc0173b84eabbb51df7ac132eb54 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 21 Feb 2018 16:10:30 -0300
>Subject: [PATCH] Bug 19936: (follow-up) Replace Check_userid - Update the
> occurrences
>
>---
> Koha/Patrons/Import.pm | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm
>index a8d17c15ba..fbf9701e92 100644
>--- a/Koha/Patrons/Import.pm
>+++ b/Koha/Patrons/Import.pm
>@@ -200,13 +200,17 @@ sub import_patrons {
>             next;
>         }
> 
>+
>         # Check if the userid provided does not exist yet
>-        if ( defined($matchpoint) and $matchpoint ne 'userid' and exists $borrower{userid}
>-                 and $borrower{userid}
>-             and ( $patron and not $patron->userid($borrower{userid})->has_valid_userid ) ) {
>-             push @errors, { duplicate_userid => 1, userid => $borrower{userid} };
>-             $invalid++;
>-             next LINE;
>+        if (    defined($matchpoint)
>+            and $matchpoint ne 'userid'
>+            and exists $borrower{userid}
>+            and $borrower{userid}
>+            and not Koha::Patron->new( { userid => $borrower{userid} } )->has_valid_userid
>+        ) {
>+            push @errors, { duplicate_userid => 1, userid => $borrower{userid} };
>+            $invalid++;
>+            next LINE;
>         }
> 
>         if ($borrowernumber) {
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 19936: 70365 | 70366 | 70367 | 70368 | 70369 | 70370 | 70371 | 70372 | 70373 | 70374 | 71787 | 71788 | 71789 | 71790 | 71791 | 71792 | 71793 | 71794 | 71795 | 71796 | 72129 | 72130 | 72131 | 72132 | 72133 | 72134 | 72135 | 72136 | 72137 | 72138 | 72139 | 72140 | 72141 | 72142 | 72143 | 72144 | 72145 | 72146 | 72147 | 72148 | 72149 | 72150 | 72151 | 72152 | 73630 | 73631 | 73632 | 73633 | 73634 | 73635 | 73636 | 73637 | 73638 | 73639 | 73640 | 73641 | 73963 | 73964 | 73965 | 73966 | 73967 | 73968 | 73969 | 73970 | 73971 | 73972 | 73973 | 73974 | 74071 | 74072 | 74073 | 74074 | 74075 | 74076 | 74077 | 74078 | 74079 | 74080 | 74081 | 74082