Attachment 139750 Details for Bug 31095 – Bug 31095: Remove GetDebarments from tools/modborrowers.pl

[patch] Bug 31095: Remove GetDebarments from tools/modborrowers.pl

Bug-31095-Remove-GetDebarments-from-toolsmodborrow.patch (text/plain), 2.73 KB, created by Martin Renvoize (ashimema) on 2022-08-25 09:31:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-08-25 09:31:54 UTC

Size: 2.73 KB

patch

obsolete

>From da5eff9fe23245187b386f1b55b775092cf47340 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 24 Aug 2022 16:30:43 +0100
>Subject: [PATCH] Bug 31095: Remove GetDebarments from tools/modborrowers.pl
>
>This patch removes GetDebarments from the modborrowers tool controller
>and replaces it with $patron->restrictions as appropriate.
>
>Test plan
>1. Confirm that the 'Batch patron modification' tool pages still load
>   and perform as expected.
>---
> tools/modborrowers.pl | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
>index bb35b8e1c0..065c1150a7 100755
>--- a/tools/modborrowers.pl
>+++ b/tools/modborrowers.pl
>@@ -35,7 +35,7 @@ use Koha::DateUtils qw( dt_from_string );
> use Koha::List::Patron qw( GetPatronLists );
> use Koha::Libraries;
> use Koha::Patron::Categories;
>-use Koha::Patron::Debarments qw( AddDebarment DelDebarment GetDebarments );
>+use Koha::Patron::Debarments qw( AddDebarment DelDebarment );
> use Koha::Patrons;
> use List::MoreUtils qw(uniq);
> 
>@@ -364,6 +364,7 @@ if ( $op eq 'do' ) {
>     my @borrowernumbers = $input->multi_param('borrowernumber');
>     # For each borrower selected
>     for my $borrowernumber ( @borrowernumbers ) {
>+        
>         # If at least one field are filled, we want to modify the borrower
>         if ( defined $infos ) {
>             # If a debarred date or debarred comment has been submitted make a new debarment
>@@ -378,19 +379,19 @@ if ( $op eq 'do' ) {
>             }
> 
>             # If debarment date or debarment comment are disabled then remove all debarrments
>+            my $patron = Koha::Patrons->find( $borrowernumber );
>             if ( grep { /debarred/ } @disabled ) {
>                 eval {
>-                   my $debarrments = GetDebarments( { borrowernumber => $borrowernumber } );
>+                   my $debarrments = $patron->restrictions;
>                    foreach my $debarment (@$debarrments) {
>-                      DelDebarment( $debarment->{'borrower_debarment_id'} );
>+                      DelDebarment( $debarment->borrower_debarment_id );
>                    }
>                 };
>             }
> 
>             $infos->{borrowernumber} = $borrowernumber;
>-            eval { Koha::Patrons->find( $borrowernumber )->set($infos)->store; };
>+            eval { $patron->set($infos)->store; };
>             if ( $@ ) { # FIXME We could provide better error handling here
>-                my $patron = Koha::Patrons->find( $borrowernumber );
>                 $infos->{cardnumber} = $patron ? $patron->cardnumber || '' : '';
>                 push @errors, { error => "can_not_update", borrowernumber => $infos->{borrowernumber}, cardnumber => $infos->{cardnumber} };
>             }
>-- 
>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