Bugzilla – Attachment 52882 Details for
Bug 16805
Log in with database admin user breaks OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16805: Log in with database admin user breaks OPAC
Bug-16805-Log-in-with-database-admin-user-breaks-O.patch (text/plain), 4.18 KB, created by
Jonathan Druart
on 2016-06-26 07:08:48 UTC
(
hide
)
Description:
Bug 16805: Log in with database admin user breaks OPAC
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-06-26 07:08:48 UTC
Size:
4.18 KB
patch
obsolete
>From 8f86fb6514831d039dc055b532909c5fd3651e19 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Thu, 23 Jun 2016 14:51:26 -0400 >Subject: [PATCH] Bug 16805: Log in with database admin user breaks OPAC > >TEST PLAN >--------- >1) Apply Jonathan's test patch >2) prove t/db_dependent/Letters.t > -- dies before finishing tests >3) Apply second test patch >4) prove t/db_dependent/Letters.t > -- dies before finishing tests > -- 'addalert' is changed to 'getalert' >5) Log into OPAC with database admin user. > -- see error given in comment #0 >6) Apply this patch >7) prove t/db_dependent/Letters.t > -- says 'getalert' > -- all tests pass. >8) Log into OPAC with database admin user. > -- logs in, but gives warning with a nice logout button. >9) run koha qa test tools. > >Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> >No kaha qa errors >In debian display diferent error: >Can't use an undefined value as an ARRAY reference at /usr/lib/perl5/DBI.pm line 2054. >Works as advertised > >NOTE: Revised test plan, as Jonathan added useful test case. > Works as I've tested above. > Hector tested older test plan which was steps > 5,6,8 and 9. > > Revised test plan again while tweaking to address comment #9. > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > C4/Letters.pm | 9 ++++----- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 12 ++++++++++++ > opac/opac-user.pl | 4 ++++ > 3 files changed, 20 insertions(+), 5 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 192f353..df8175f 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -312,21 +312,20 @@ sub delalert { > sub getalert { > my ( $borrowernumber, $type, $externalid ) = @_; > my $dbh = C4::Context->dbh; >- my $query = "SELECT a.*, b.branchcode FROM alert a JOIN borrowers b USING(borrowernumber) WHERE"; >+ my $query = "SELECT a.*, b.branchcode FROM alert a JOIN borrowers b USING(borrowernumber) WHERE 1"; > my @bind; > if ($borrowernumber and $borrowernumber =~ /^\d+$/) { >- $query .= " borrowernumber=? AND "; >+ $query .= " AND borrowernumber=?"; > push @bind, $borrowernumber; > } > if ($type) { >- $query .= " type=? AND "; >+ $query .= " AND type=?"; > push @bind, $type; > } > if ($externalid) { >- $query .= " externalid=? AND "; >+ $query .= " AND externalid=?"; > push @bind, $externalid; > } >- $query =~ s/ AND $//; > my $sth = $dbh->prepare($query); > $sth->execute(@bind); > return $sth->fetchall_arrayref({}); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 264641f..c56896a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -27,6 +27,18 @@ > </div> > <div class="span10"> > <div id="userdetails" class="maincontent"> >+ >+ [% IF adminWarning %] >+ <div id="adminwarning" class="dialog alert"> >+ <p> >+<strong><i class="fa fa-exclamation-triangle"> </i> Warning:</strong> >+Using this account is not recommended because some parts of Koha will not function as expected. Instead, please log in with a different account. >+<a class="btn btn-small" href="/cgi-bin/koha/opac-main.pl?logout.x=1"> >+<i class="fa fa-sign-out"> </i> Log out</a> >+ </p> >+ </div> >+ [% END %] >+ > [% IF ( bor_messages ) %] > <div class="alert alert-info"> > <h3>Messages for you</h3> >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 413c26d..a23a032 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -80,6 +80,10 @@ my $canrenew = 1; > > $template->param( shibbolethAuthentication => C4::Context->config('useshibboleth') ); > >+if (!$borrowernumber) { >+ $template->param( adminWarning => 1 ); >+} >+ > # get borrower information .... > my ( $borr ) = GetMemberDetails( $borrowernumber ); > >-- >2.8.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16805
:
52762
|
52764
|
52827
|
52845
|
52846
|
52847
|
52877
|
52878
|
52879
|
52880
|
52881
| 52882