Attachment 142070 Details for Bug 31095 – Bug 31095: Remove GetDebarments from Patron::Import

[patch] Bug 31095: Remove GetDebarments from Patron::Import

Bug-31095-Remove-GetDebarments-from-PatronImport.patch (text/plain), 2.23 KB, created by Martin Renvoize (ashimema) on 2022-10-18 14:09:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-10-18 14:09:27 UTC

Size: 2.23 KB

patch

obsolete

>From 39b8c05b31279b67da47a9a6a8be5eddd2e34ced Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 25 Aug 2022 08:56:54 +0100
>Subject: [PATCH] Bug 31095: Remove GetDebarments from Patron::Import
>
>This patch replaced GetDebarments with $patron->restrictions->search in
>Koha::Patron::Import.
>
>Test plan
>1. Confirm that importing patrons with debarred and debarredcomment
>   fields in the import still works as expected
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> Koha/Patrons/Import.pm | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm
>index 7d661a4228..070abd774d 100644
>--- a/Koha/Patrons/Import.pm
>+++ b/Koha/Patrons/Import.pm
>@@ -29,7 +29,7 @@ use C4::Letters qw( GetPreparedLetter EnqueueLetter );
> use Koha::Libraries;
> use Koha::Patrons;
> use Koha::Patron::Categories;
>-use Koha::Patron::Debarments qw( AddDebarment GetDebarments );
>+use Koha::Patron::Debarments qw( AddDebarment );
> use Koha::DateUtils qw( dt_from_string output_pref );
> 
> =head1 NAME
>@@ -290,16 +290,15 @@ sub import_patrons {
>                     if ( $borrower{debarred} && ( ( $borrower{debarred} ne $member->{debarred} ) || ( $borrower{debarredcomment} ne $member->{debarredcomment} ) ) ) {
> 
>                         # Check to see if this debarment already exists
>-                        my $debarrments = GetDebarments(
>+                        my $restrictions = $patron->restrictions->search(
>                             {
>-                                borrowernumber => $borrowernumber,
>-                                expiration     => $borrower{debarred},
>-                                comment        => $borrower{debarredcomment}
>+                                expiration => $borrower{debarred},
>+                                comment    => $borrower{debarredcomment}
>                             }
>                         );
> 
>                         # If it doesn't, then add it!
>-                        unless (@$debarrments) {
>+                        unless ($restrictions->count) {
>                             AddDebarment(
>                                 {
>                                     borrowernumber => $borrowernumber,
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31095: 139614 | 139719 | 139720 | 139721 | 139722 | 139723 | 139724 | 139725 | 139726 | 139727 | 139728 | 139742 | 139743 | 139744 | 139745 | 139746 | 139747 | 139748 | 139749 | 139750 | 139751 | 139752 | 139753 | 139754 | 139755 | 139756 | 139757 | 139758 | 140714 | 140715 | 140716 | 140717 | 140718 | 140719 | 140720 | 140721 | 140722 | 140723 | 140724 | 140725 | 140726 | 140727 | 140728 | 140729 | 140730 | 140731 | 142059 | 142060 | 142061 | 142062 | 142063 | 142064 | 142065 | 142066 | 142067 | 142068 | 142069 | 142070 | 142071 | 142072 | 142073 | 142074 | 142075 | 142076 | 143745 | 143746 | 143747 | 143748 | 143749 | 143750 | 143751 | 143752 | 143753 | 143754 | 143755 | 143756 | 143757 | 143758 | 143759 | 143760 | 143761 | 143762 | 143763 | 144903 | 144904 | 144905 | 144906 | 144907 | 144908 | 144909 | 144910 | 144911 | 144912 | 144913 | 144914 | 144915 | 144916 | 144917 | 144918 | 144919 | 144920 | 144921 | 145800 | 145801 | 145803 | 145845