From 1cf6df680b63f88d28560b5c995da1d0361557f2 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 30 Jan 2014 10:24:33 -0500 Subject: [PATCH] Bug 11642 - Batch patron deletion/anonymization should not allow permanent destruction of patron data The Batch patron deletion/anonymization tool gives the option of destroying patron data or moving it to the "trash". I see know reason why we allow deletion of patrons without moving them to deletedborrowers first. We don't allow this kind of behavior for records or items, so why patrons? Furthermore it seems far to easy to mis-use this tool by accident, further exacerbating the situation. Test Plan: 1) Apply this patch 2) Verify you can no longer permanently delete patrons with the batch patron deletion/anonymization tool, instead they will always be moved to deletedborrowers. --- .../prog/en/modules/tools/cleanborrowers.tt | 12 +----------- tools/cleanborrowers.pl | 20 ++++++-------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt index 7e1fc97..d23bc19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt @@ -117,16 +117,6 @@
- [% IF ( totalToDelete ) %] -
What do you want to do for deleted patrons? - - - - - -
- - [% END %] [% IF ( totalToAnonymize ) %] Checkout history for [% totalToAnonymize %] patrons will be anonymized @@ -138,7 +128,7 @@ -
Cancel
+
Cancel
diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl index 0d48b99..8539f08 100755 --- a/tools/cleanborrowers.pl +++ b/tools/cleanborrowers.pl @@ -122,20 +122,12 @@ if ( $params->{'step3'} ) { my $membersToDelete = GetBorrowersToExpunge( { not_borrowered_since => $filterdate1, expired_before => $borrower_dateexpiry, category_code => $borrower_categorycode } ); $totalDel = scalar(@$membersToDelete); - $radio = $params->{'radio'}; - if ( $radio eq 'trash' ) { - my $i; - for ( $i = 0 ; $i < $totalDel ; $i++ ) { - MoveMemberToDeleted( $membersToDelete->[$i]->{'borrowernumber'} ); - C4::VirtualShelves::HandleDelBorrower( $membersToDelete->[$i]->{'borrowernumber'} ); - DelMember( $membersToDelete->[$i]->{'borrowernumber'} ); - } - } else { # delete completly. - my $i; - for ( $i = 0 ; $i < $totalDel ; $i++ ) { - C4::VirtualShelves::HandleDelBorrower( $membersToDelete->[$i]->{'borrowernumber'} ); - DelMember( $membersToDelete->[$i]->{'borrowernumber'} ); - } + my $i; + for ( $i = 0 ; $i < $totalDel ; $i++ ) { + MoveMemberToDeleted( $membersToDelete->[$i]->{'borrowernumber'} ); + C4::VirtualShelves::HandleDelBorrower( + $membersToDelete->[$i]->{'borrowernumber'} ); + DelMember( $membersToDelete->[$i]->{'borrowernumber'} ); } $template->param( do_delete => '1', -- 1.7.2.5