Attachment 20766 Details for Bug 5904 – Bug 5904: ysearch.pl members improvements (Independent branches behaviour)

[patch] Bug 5904: ysearch.pl members improvements (Independent branches behaviour)

Bug-5904-ysearchpl-members-improvements-Independen.patch (text/plain), 2.02 KB, created by Kyle M Hall (khall) on 2013-09-03 14:04:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2013-09-03 14:04:03 UTC

Size: 2.02 KB

patch

obsolete

>From d85471ab0aebe30518a7ba9af7223defa4c3ed6f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Thu, 27 Jun 2013 15:33:46 +0200
>Subject: [PATCH] Bug 5904: ysearch.pl members improvements (Independent branches behaviour)
>
>Test plan:
>- Add a staff user foo in a library A
>- Add a staff user bar in a library B
>- log in as foo and try to search 'bar'
>- Switch on (Prevent) the new pref IndependentBranches
>- the search returns no result
>- log in as a superlibrarian
>- Check that you are allow to search all patrons.
>
>Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Passes koha-qa.pl, works as advertised.
>---
> circ/ysearch.pl |   26 ++++++++++++++++++--------
> 1 files changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/circ/ysearch.pl b/circ/ysearch.pl
>index 8a48c51..4a3663e 100755
>--- a/circ/ysearch.pl
>+++ b/circ/ysearch.pl
>@@ -44,13 +44,23 @@ if ($auth_status ne "ok") {
> }
> 
> my $dbh = C4::Context->dbh;
>-my $sql = qq(SELECT surname, firstname, cardnumber, address, city, zipcode, country
>-             FROM borrowers
>-             WHERE surname LIKE ?
>-             OR firstname LIKE ?
>-             OR cardnumber LIKE ?
>-             ORDER BY surname, firstname
>-             LIMIT 10);
>+my $sql = q(
>+    SELECT surname, firstname, cardnumber, address, city, zipcode, country
>+    FROM borrowers
>+    WHERE ( surname LIKE ?
>+        OR firstname LIKE ?
>+        OR cardnumber LIKE ? )
>+);
>+if (C4::Context->preference("IndependentBranches")){
>+  if ( C4::Context->userenv
>+      && (C4::Context->userenv->{flags} % 2) !=1
>+      && C4::Context->userenv->{'branch'}
>+  ){
>+     $sql .= " AND borrowers.branchcode =" . $dbh->quote(C4::Context->userenv->{'branch'});
>+  }
>+}
>+
>+$sql    .= q( ORDER BY surname, firstname LIMIT 10);
> my $sth = $dbh->prepare( $sql );
> $sth->execute("$query%", "$query%", "$query%");
> 
>@@ -68,4 +78,4 @@ while ( my $rec = $sth->fetchrow_hashref ) {
>           "}";
>     $i++;
> }
>-print "]";
>\ No newline at end of file
>+print "]";
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 5904: 3364 | 3365 | 3809 | 19259 | 20122 | 20742 | 20750 | 20766