Bugzilla – Attachment 19259 Details for
Bug 5904
ysearch.pl members improvements (Independant branches behaviour)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 5904: ysearch.pl members improvements (Independent branches behaviour)
Bug-5904-ysearchpl-members-improvements-Independen.patch (text/plain), 4.62 KB, created by
Jonathan Druart
on 2013-06-27 13:43:06 UTC
(
hide
)
Description:
Bug 5904: ysearch.pl members improvements (Independent branches behaviour)
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-06-27 13:43:06 UTC
Size:
4.62 KB
patch
obsolete
>From 155bdf717392a1ed63e3cb1cdcf96a2482e234e7 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 IndependentBranchPatron >- the search returns no result >- log in as a superlibrarian >- Check that you are allow to search all patrons. >--- > circ/ysearch.pl | 26 ++++++++++++++------ > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 9 +++++++ > .../prog/en/modules/admin/preferences/patrons.pref | 7 ++++++ > 4 files changed, 35 insertions(+), 8 deletions(-) > >diff --git a/circ/ysearch.pl b/circ/ysearch.pl >index 8a48c51..99acf80 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("IndependentBranchPatron")){ >+ 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 "]"; >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index fbd0387..73aa60e 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -427,3 +427,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' > INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo'); > INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHoldNotes',0,'Show hold notes on OPAC','','YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo'); >+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('IndependentBranchPatron','0','Allow/Don\'t allow limit to the librarian branch in circ member auto completion', '', 'YesNo'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 5963d24..a559c52 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -7010,6 +7010,15 @@ CREATE TABLE IF NOT EXISTS borrower_files ( > SetVersion($DBversion); > } > >+ >+$DBversion = "3.13.00.XXX"; >+if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >+ $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('IndependentBranchPatron','0','Allow/Don\'t allow limit to the librarian branch in circ member auto completion', '', 'YesNo')"); >+ print "Upgrade to $DBversion done (Bug 5904: Add syspref IndependentBranchPatron)\n"; >+ SetVersion ($DBversion); >+} >+ >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >index 74d14af..520a9aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref >@@ -139,3 +139,10 @@ Patrons: > yes: Do > no: "Don't" > - enable the ability to upload and attach arbitrary files to a borrower record. >+ - >+ - pref: IndependentBranchPatron >+ choices: >+ yes: Prevent >+ no: "Don't prevent" >+ - staff (but not superlibrarians) from searching patrons belonging to other libraries. >+ >-- >1.7.10.4
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 5904
:
3364
|
3365
|
3809
|
19259
|
20122
|
20742
|
20750
|
20766