From a71cc14a52589f45bc30dad81b8c7fc0ac35d9fc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Sat, 5 Sep 2015 16:41:58 +0200
Subject: [PATCH] Bug 14782: Add possibility to search patrons using the
 username (userid)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch makes it possible to search for users using the username (userid / login name).

To test:

- Apply patch
- Do searches from Home > Patrons
- Search after a full username or parts of a username with Search fields = Standard and Search fields = Userid
- Perform the searches from the top bar (expand with [+]) and from the "Filters" part at the left
- Make sure that other searches behave as before

Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
---
 C4/Utils/DataTables/Members.pm                             | 3 ++-
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 5 +++++
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt  | 5 +++++
 svc/members/search                                         | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm
index cdaa33f0ea..4240fa0eab 100644
--- a/C4/Utils/DataTables/Members.pm
+++ b/C4/Utils/DataTables/Members.pm
@@ -61,9 +61,10 @@ sub search {
     # split on coma
     $searchmember =~ s/,/ /g if $searchmember;
     my $searchfields = {
-        standard => 'surname,firstname,othernames,cardnumber',
+        standard => 'surname,firstname,othernames,cardnumber,userid',
         email => 'email,emailpro,B_email',
         borrowernumber => 'borrowernumber',
+        userid => 'userid',
         phone => 'phone,phonepro,B_phone,altcontactphone,mobile',
         address => 'streettype,address,address2,city,state,zipcode,country',
         dateofbirth => 'dateofbirth',
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 646c70a1d8..bb09574759 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -32,6 +32,11 @@
               [% ELSE %]
                 <option value='borrowernumber'>Borrower number</option>
               [% END %]
+              [% IF searchfieldstype == "userid" %]
+                <option selected="selected" value='userid'>Username</option>
+              [% ELSE %]
+                <option value='userid'>Username</option>
+              [% END %]
               [% IF searchfieldstype == "phone" %]
                 <option selected="selected" value='phone'>Phone number</option>
               [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 877be25323..603920b762 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -424,6 +424,11 @@ function filterByFirstLetterSurname(letter) {
                 [% ELSE %]
                   <option value='borrowernumber'>Borrower number</option>
                 [% END %]
+                [% IF searchfieldstype == "userid" %]
+                  <option selected="selected" value='userid'>Username</option>
+                [% ELSE %]
+                  <option value='userid'>Username</option>
+                [% END %]
                 [% IF searchfieldstype == "phone" %]
                   <option selected="selected" value='phone'>Phone number</option>
                 [% ELSE %]
diff --git a/svc/members/search b/svc/members/search
index 6343e2ed6a..1c2d6449ca 100755
--- a/svc/members/search
+++ b/svc/members/search
@@ -140,7 +140,7 @@ All following params are optional:
     firstletter => search patrons with surname begins with this pattern (currently only used for 1 letter)
     categorycode and branchcode => search patrons belong to a given categorycode or a branchcode
     searchtype: can be 'contain' or 'start_with'
-    searchfieldstype: Can be 'standard', 'email', 'borrowernumber', 'phone' or 'address'
+    searchfieldstype: Can be 'standard', 'email', 'borrowernumber', 'userid', 'phone' or 'address'
 
 =cut
 
-- 
2.39.5