From 607c66e436a0e4eddfb59f1c0ce6a69311c8e9ce Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 12 Feb 2018 14:14:32 -0300 Subject: [PATCH] Bug 18403: Fix few errors found with hit_pages.t Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 1 + members/mod_debarment.pl | 4 ++-- members/setstatus.pl | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt index e60bc01c99..f83fc3bab3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -4,6 +4,7 @@ Print Receipt for [% cardnumber %] [% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'blocking_errors.inc' %] [% INCLUDE 'slip-print.inc' #printThenClose %] diff --git a/members/mod_debarment.pl b/members/mod_debarment.pl index 8c18df83ec..bc155e54a3 100755 --- a/members/mod_debarment.pl +++ b/members/mod_debarment.pl @@ -27,12 +27,12 @@ use Koha::Patron::Debarments; my $cgi = new CGI; -my ( $loggedinuser, $cookie, $sessionID ) = checkauth( $cgi, 0, { borrowers => 'edit_borrowers' }, 'intranet' ); +my ( $loggedinuserid, $cookie, $sessionID ) = checkauth( $cgi, 0, { borrowers => 'edit_borrowers' }, 'intranet' ); my $borrowernumber = $cgi->param('borrowernumber'); my $action = $cgi->param('action'); -my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"; +my $logged_in_user = Koha::Patrons->find( { userid => $loggedinuserid } ) or die "Not logged in"; my $patron = Koha::Patrons->find($borrowernumber); # Ideally we should display a warning on the interface if the patron is not allowed diff --git a/members/setstatus.pl b/members/setstatus.pl index ff4b74b119..bb22f3d184 100755 --- a/members/setstatus.pl +++ b/members/setstatus.pl @@ -34,7 +34,7 @@ use Koha::Patrons; my $input = new CGI; -my ( $loggedinuser ) = checkauth($input, 0, { borrowers => 'edit_borrowers' }, 'intranet'); +my ( $loggedinuserid ) = checkauth($input, 0, { borrowers => 'edit_borrowers' }, 'intranet'); my $destination = $input->param("destination") || ''; my $borrowernumber=$input->param('borrowernumber'); @@ -44,13 +44,13 @@ my $reregistration = $input->param('reregistration') || ''; my $dbh = C4::Context->dbh; my $dateexpiry; -my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in"; +my $logged_in_user = Koha::Patrons->find( { userid => $loggedinuserid } ) or die "Not logged in"; my $patron = Koha::Patrons->find( $borrowernumber ); # Ideally we should display a warning on the interface if the logged in user is # not allowed to modify this patron. # But a librarian is not supposed to hack the system -unless ( $logged_in_user->can_see_patron_infos($patron) ) { +if ( $logged_in_user->can_see_patron_infos($patron) ) { if ( $reregistration eq 'y' ) { # re-reregistration function to automatic calcul of date expiry $dateexpiry = $patron->renew_account; -- 2.11.0