Attachment 47255 Details for Bug 10612 – Bug 10612 [QA Followup]

[patch] Bug 10612 [QA Followup]

Bug-10612-QA-Followup.patch (text/plain), 2.61 KB, created by Nick Clemens (kidclamp) on 2016-01-25 13:59:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2016-01-25 13:59:11 UTC

Size: 2.61 KB

patch

obsolete

>From 72261fb743cdb21f0d393dfca4538fe47bcc1fb8 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 22 Jan 2016 02:09:54 +0000
>Subject: [PATCH] Bug 10612 [QA Followup]
>
>1 - Use Koha::List::Patron
>2 - Return only non-empty lists for deletion selection
>3 - Fix _skip_bo... to accept patro_list_patrons3 - Fix _skip_bo... to
>accept patro_list_patrons3 - Fix _skip_bo... to accept
>patro_list_patrons
>---
> tools/cleanborrowers.pl | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
>diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
>index 86b410f..7e0db06 100755
>--- a/tools/cleanborrowers.pl
>+++ b/tools/cleanborrowers.pl
>@@ -85,9 +85,8 @@ if ( $step == 2 ) {
> 
>     my $patrons_to_delete;
>     if ($patron_list_id) {
>-        my @patron_list_patrons =
>-          Koha::Database->new()->schema()->resultset('PatronListPatron')
>-          ->search( { patron_list_id => $patron_list_id } );
>+        my @patron_list = GetPatronLists( {patron_list_id=>$patron_list_id});
>+        my @patron_list_patrons = $patron_list[0]->patron_list_patrons();
>         $patrons_to_delete = \@patron_list_patrons;
>     }
>     else {
>@@ -125,9 +124,8 @@ elsif ( $step == 3 ) {
>     if ($do_delete) {
>         my $patrons_to_delete;
>         if ($patron_list_id) {
>-            my @patron_list_patrons =
>-              Koha::Database->new()->schema()->resultset('PatronListPatron')
>-              ->search( { patron_list_id => $patron_list_id } );
>+            my @patron_lists = GetPatronLists( { patron_list_id => $patron_list_id } );
>+            my @patron_list_patrons = $patron_lists[0]->patron_list_patrons();
>             $patrons_to_delete = \@patron_list_patrons;
>         }
>         else {
>@@ -170,7 +168,13 @@ elsif ( $step == 3 ) {
>         testrun => ( $radio eq "testrun" ) ? 1: 0,
>     );
> } else { # $step == 1
>-    $template->param( patron_lists => [ GetPatronLists() ] );
>+    my @all_lists = GetPatronLists();
>+    my @non_empty_lists;
>+    foreach my $list (@all_lists){
>+    my @patrons = $list->patron_list_patrons();
>+        if( scalar @patrons ) { push(@non_empty_lists,$list) }
>+    }
>+    $template->param( patron_lists => [ @non_empty_lists ] );
> }
> 
> $template->param(
>@@ -190,7 +194,7 @@ sub _skip_borrowers_with_nonzero_balance_or_issues {
>     my $balance;
>     my $issues;
>     @$borrowers = map {
>-        (undef, $issues, $balance) = GetMemberIssuesAndFines( $_->{borrowernumber} );
>+        (undef, $issues, $balance) = GetMemberIssuesAndFines( $_->{borrowernumber} || $_->get_column('borrowernumber') );
>         ($balance != 0 || $issues!= 0) ? (): ($_);
>     } @$borrowers;
> }
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 10612: 19766 | 19767 | 21081 | 21444 | 21445 | 21446 | 22837 | 22838 | 28779 | 28780 | 36311 | 36313 | 36314 | 36315 | 41289 | 41363 | 41364 | 41365 | 46239 | 46279 | 46280 | 46834 | 47153 | 47224 | 47225 | 47226 | 47255 | 47259 | 47393 | 47394 | 47395 | 47396 | 47478 | 48833 | 48881 | 48888 | 48890 | 48891 | 48892 | 49596 | 49597 | 49607 | 49694 | 49740 | 49741 | 49766 | 49767 | 49768 | 49769 | 49770