Attachment 71760 Details for Bug 12598 – Bug 12598: Re-add some missing stuffs

[patch] Bug 12598: Re-add some missing stuffs

Bug-12598-Re-add-some-missing-stuffs.patch (text/plain), 1.96 KB, created by Kyle M Hall (khall) on 2018-02-16 13:46:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2018-02-16 13:46:20 UTC

Size: 1.96 KB

patch

obsolete

>From 0be269245bd08dc1cadf696d6c0944795c9ea5a5 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 25 Jul 2017 10:19:20 -0300
>Subject: [PATCH] Bug 12598: Re-add some missing stuffs
>
>This patch will have to be squashed with previous ones, but for
>readability I prefer to let it alone for now.
>
>It reintroduces 2 missing changes:
>  commit fd123903651435c56ca14d88897e9ce4d7a38bb5
>    Bug 15010: Import patron tool creates 'duplicate' restrictions (
>    debarments )
>  commit 011d8e9855ffeb1779f5c1aadc9f4367c298cee7
>    Bug 12543 - Add userid as matchpoint for "Import patrons" tool
>
>Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
>---
> Koha/Patrons/Import.pm | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm
>index 965db66..db6beb0 100644
>--- a/Koha/Patrons/Import.pm
>+++ b/Koha/Patrons/Import.pm
>@@ -165,6 +165,9 @@ sub import_patrons {
>         if ( defined($matchpoint) && ( $matchpoint eq 'cardnumber' ) && ( $borrower{'cardnumber'} ) ) {
>             $member = Koha::Patrons->find( { cardnumber => $borrower{'cardnumber'} } );
>         }
>+        elsif ( ($matchpoint eq 'userid') && ($borrower{'userid'}) ) {
>+            $member = Koha::Patrons->find( { userid => $borrower{userid} } );
>+        }
>         elsif ($extended) {
>             if ( defined($matchpoint_attr_type) ) {
>                 foreach my $attr (@$patron_attributes) {
>@@ -244,7 +247,8 @@ sub import_patrons {
>                 );
>                 next LINE;
>             }
>-            if ( $borrower{debarred} ) {
>+            # Don't add a new restriction if the existing 'combined' restriction matches this one
>+            if ( $borrower{debarred} && ( ( $borrower{debarred} ne $member->{debarred} ) || ( $borrower{debarredcomment} ne $member->{debarredcomment} ) ) ) {
> 
>                 # Check to see if this debarment already exists
>                 my $debarrments = GetDebarments(
>-- 
>2.10.2

Actions: View | Diff | Splinter Review

Attachments on bug 12598: 29807 | 29808 | 29809 | 29939 | 30755 | 30780 | 35557 | 35558 | 35559 | 35560 | 35848 | 35849 | 35850 | 35851 | 35964 | 36684 | 36685 | 36687 | 36688 | 36690 | 36692 | 36693 | 36694 | 36695 | 36696 | 39124 | 39125 | 39126 | 39127 | 39128 | 41790 | 41791 | 41792 | 41793 | 41794 | 44065 | 44066 | 44067 | 44068 | 44069 | 48753 | 48754 | 48755 | 48756 | 48757 | 50693 | 50694 | 50695 | 50696 | 50697 | 50698 | 50699 | 50700 | 50704 | 51122 | 51357 | 51358 | 51359 | 51360 | 51361 | 51362 | 51363 | 51364 | 51365 | 51366 | 51367 | 51368 | 51369 | 51370 | 51371 | 51372 | 52323 | 52324 | 52325 | 52326 | 52327 | 52328 | 52329 | 52330 | 52331 | 52332 | 52333 | 52540 | 64437 | 64438 | 64855 | 65214 | 65215 | 65216 | 65217 | 65218 | 65819 | 65820 | 65821 | 65822 | 65823 | 65824 | 66353 | 66354 | 66355 | 66356 | 66357 | 66358 | 66359 | 66575 | 66576 | 66577 | 66578 | 66579 | 66580 | 66581 | 66582 | 67276 | 67277 | 70265 | 70266 | 71755 | 71756 | 71757 | 71758 | 71759 | 71760 | 71761 | 71762 | 71763 | 71764 | 71765 | 71766