Attachment 71512 Details for Bug 18403 – Bug 18403: Batch patron modification tool

[patch] Bug 18403: Batch patron modification tool

Bug-18403-Batch-patron-modification-tool.patch (text/plain), 5.12 KB, created by Jonathan Druart on 2018-02-12 19:34:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-02-12 19:34:20 UTC

Size: 5.12 KB

patch

obsolete

>From c6299bbca5dc1654652814f9792f276670e1ac7f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 5 Apr 2017 18:47:30 -0300
>Subject: [PATCH] Bug 18403: Batch patron modification tool
>
>Do not allow a logged in staff user to modify patrons that are not part of his
>group if he is not allowed.
>
>Test plan:
>Make sure you are not allowed to modify patrons that are not part of your group
>from the batch patron modification tool
>
>Signed-off-by: Signed-off-by: Jon McGowan <jon.mcgowan@ptfs-europe.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> tools/modborrowers.pl | 58 +++++++++++++++++++++------------------------------
> 1 file changed, 24 insertions(+), 34 deletions(-)
>
>diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
>index 5c8e1b61c2..7e51a5a5e0 100755
>--- a/tools/modborrowers.pl
>+++ b/tools/modborrowers.pl
>@@ -51,6 +51,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>     }
> );
> 
>+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
>+
> my %cookies   = parse CGI::Cookie($cookie);
> my $sessionID = $cookies{'CGISESSID'}->value;
> my $dbh       = C4::Context->dbh;
>@@ -62,7 +64,7 @@ if ( $op eq 'show' ) {
>     my $patron_list_id = $input->param('patron_list_id');
>     my @borrowers;
>     my @cardnumbers;
>-    my @notfoundcardnumbers;
>+    my ( @notfoundcardnumbers, @from_another_group_of_libraries );
> 
>     # Get cardnumbers from a file or the input area
>     my @contentlist;
>@@ -86,11 +88,17 @@ if ( $op eq 'show' ) {
> 
>     my $max_nb_attr = 0;
>     for my $cardnumber ( @cardnumbers ) {
>-        my $borrower = GetBorrowerInfos( cardnumber => $cardnumber );
>-        if ( $borrower ) {
>-            $max_nb_attr = scalar( @{ $borrower->{patron_attributes} } )
>-                if scalar( @{ $borrower->{patron_attributes} } ) > $max_nb_attr;
>-            push @borrowers, $borrower;
>+        my $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
>+        if ( $patron ) {
>+            if ( $logged_in_user->can_see_patron_infos( $patron ) ) {
>+                $patron = $patron->unblessed;
>+                $patron->{patron_attributes} = C4::Members::Attributes::GetBorrowerAttributes( $patron->{borrowernumber} );
>+                $max_nb_attr = scalar( @{ $patron->{patron_attributes} } )
>+                    if scalar( @{ $patron->{patron_attributes} } ) > $max_nb_attr;
>+                push @borrowers, $patron;
>+            } else {
>+                push @notfoundcardnumbers, $cardnumber;
>+            }
>         } else {
>             push @notfoundcardnumbers, $cardnumber;
>         }
>@@ -289,8 +297,8 @@ if ( $op eq 'do' ) {
>             $infos->{borrowernumber} = $borrowernumber;
>             my $success = ModMember(%$infos);
>             if (!$success) {
>-                my $borrowerinfo = GetBorrowerInfos( borrowernumber => $borrowernumber );
>-                $infos->{cardnumber} = $borrowerinfo->{cardnumber} || '';
>+                my $patron = Koha::Patrons->find( $borrowernumber );
>+                $infos->{cardnumber} = $patron ? $patron->cardnumber || '' : '';
>                 push @errors, { error => "can_not_update", borrowernumber => $infos->{borrowernumber}, cardnumber => $infos->{cardnumber} };
>             }
>         }
>@@ -329,11 +337,14 @@ if ( $op eq 'do' ) {
>     my @borrowers;
>     my $max_nb_attr = 0;
>     for my $borrowernumber ( @borrowernumbers ) {
>-        my $borrower = GetBorrowerInfos( borrowernumber => $borrowernumber );
>-        if ( $borrower ) {
>-            $max_nb_attr = scalar( @{ $borrower->{patron_attributes} } )
>-                if scalar( @{ $borrower->{patron_attributes} } ) > $max_nb_attr;
>-            push @borrowers, $borrower;
>+        my $patron = Koha::Patrons->find( $borrowernumber );
>+        if ( $patron ) {
>+            $patron = $patron->unblessed;
>+            $patron->{category_description} = $patron->category->description;
>+            $patron->{patron_attributes} = C4::Members::Attributes::GetBorrowerAttributes( $patron->{borrowernumber} );
>+            $max_nb_attr = scalar( @{ $patron->{patron_attributes} } )
>+                if scalar( @{ $patron->{patron_attributes} } ) > $max_nb_attr;
>+            push @borrowers, $patron;
>         }
>     }
>     my @patron_attributes_option;
>@@ -363,24 +374,3 @@ $template->param(
> );
> output_html_with_http_headers $input, $cookie, $template->output;
> exit;
>-
>-sub GetBorrowerInfos {
>-    my ( %info ) = @_;
>-    my $patron = Koha::Patrons->find( \%info );
>-    my $borrower;
>-    if ( $patron ) {
>-        $borrower = $patron->unblessed;
>-        for ( qw(dateenrolled dateexpiry) ) {
>-            my $userdate = $borrower->{$_};
>-            unless ($userdate && $userdate ne "0000-00-00" and $userdate ne "9999-12-31") {
>-                $borrower->{$_} = '';
>-                next;
>-            }
>-            $borrower->{$_} = $userdate || '';
>-        }
>-        $borrower->{category_description} = $patron->category->description;
>-        my $attr_loop = C4::Members::Attributes::GetBorrowerAttributes( $borrower->{borrowernumber} );
>-        $borrower->{patron_attributes} = $attr_loop;
>-    }
>-    return $borrower;
>-}
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 18403: 62010 | 62011 | 62012 | 62013 | 62014 | 62015 | 62016 | 62017 | 62018 | 62019 | 62020 | 62021 | 62022 | 62023 | 62024 | 62025 | 62026 | 62027 | 62028 | 62029 | 62030 | 62031 | 62032 | 62033 | 62302 | 62303 | 62830 | 62831 | 62832 | 62833 | 62834 | 62835 | 62836 | 62837 | 62838 | 62839 | 62840 | 62841 | 62842 | 62843 | 62844 | 62845 | 62846 | 62847 | 62848 | 62849 | 62850 | 62851 | 62852 | 62853 | 62854 | 62855 | 71392 | 71394 | 71500 | 71501 | 71502 | 71503 | 71504 | 71505 | 71506 | 71507 | 71508 | 71509 | 71510 | 71511 | 71512 | 71513 | 71514 | 71515 | 71516 | 71517 | 71518 | 71519 | 71520 | 71521 | 71522 | 71523 | 71524 | 71525 | 71526 | 71527 | 71528 | 71529 | 71530 | 71767