projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d433a4d)
Bug 18403: Fix few errors found with hit_pages.t
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 12 Feb 2018 17:14:32 +0000 (14:14 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 12 Feb 2018 18:41:43 +0000 (15:41 -0300)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt patch | blob | history
members/mod_debarment.pl patch | blob | history
members/setstatus.pl patch | blob | history

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 e60bc01..f83fc3b 100644 (file)
--- 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 @@
 <title>Print Receipt for [% cardnumber %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" />
+[% INCLUDE 'blocking_errors.inc' %]
 [% INCLUDE 'slip-print.inc' #printThenClose %]
 </head>
 <body id="pat_printfeercpt" class="pat">
diff --git a/members/mod_debarment.pl b/members/mod_debarment.pl
index 8c18df8..bc155e5 100755 (executable)
--- 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 ff4b74b..bb22f3d 100755 (executable)
--- 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;
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git