From f2c5b7b036a47289a069f89bf3e63ede548058d8 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 6 Apr 2016 11:33:11 +0100
Subject: [PATCH] Bug 15930: Make patron searches defaulting on 'contain'

The default patron search types has changed from 'contain' to
start_with. Users consider it as a bug.
This patch revert the previous changes to default on 'contain'.

Test plan:
Search for patrons in different places (guarantor, checkout, patron
module, acquisition module, etc.) and confirm that the default is always
'contain'

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
(cherry picked from commit a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 C4/Utils/DataTables/Members.pm                            | 2 +-
 .../intranet-tmpl/prog/en/includes/patron-search.inc      | 8 ++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 7 ++++---
 members/member.pl                                         | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm
index 1ebecd7e59..cc3cba095d 100644
--- a/C4/Utils/DataTables/Members.pm
+++ b/C4/Utils/DataTables/Members.pm
@@ -13,7 +13,7 @@ sub search {
     my $firstletter = $params->{firstletter};
     my $categorycode = $params->{categorycode};
     my $branchcode = $params->{branchcode};
-    my $searchtype = $params->{searchtype} || 'start_with';
+    my $searchtype = $params->{searchtype} || 'contain';
     my $searchfieldstype = $params->{searchfieldstype} || 'standard';
     my $dt_params = $params->{dt_params};
 
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 b66e424025..02ca3983e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -68,12 +68,12 @@
         <p>
             <label for="searchtype">Search type:</label>
             <select name="searchtype" id="searchtype">
-              [% IF searchtype != 'start_with' %]
-                  <option value='start_with'>Starts with</option>
-                  <option selected="selected" value='contain'>Contains</option>
-              [% ELSE %]
+              [% IF searchtype == 'start_with' %]
                   <option selected="selected" value='start_with'>Starts with</option>
                   <option value='contain'>Contains</option>
+              [% ELSE %]
+                  <option value='start_with'>Starts with</option>
+                  <option selected="selected" value='contain'>Contains</option>
               [% END %]
             </select>
         </p>
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 a0a47cc56d..88a00a44eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -463,10 +463,11 @@ function filterByFirstLetterSurname(letter) {
             <li>
               <label for="searchtype_filter">Search type:</label>
               <select name="searchtype" id="searchtype_filter">
-                <option value='start_with'>Starts with</option>
-                [% IF searchtype == "contain" %]
-                  <option value="contain" selected="selected">Contains</option>
+                [% IF searchtype == "start_with" %]
+                  <option value='start_with' selected="selected">Starts with</option>
+                  <option value="contain">Contains</option>
                 [% ELSE %]
+                  <option value='start_with'>Starts with</option>
                   <option value="contain" selected="selected">Contains</option>
                 [% END %]
               </select>
diff --git a/members/member.pl b/members/member.pl
index 1cc5ac5606..0d1868761e 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -79,7 +79,7 @@ $template->param(
     searchmember        => $searchmember,
     branchcode_filter   => $input->param('branchcode_filter'),
     categorycode_filter => $input->param('categorycode_filter'),
-    searchtype          => $input->param('searchtype') || 'start_with',
+    searchtype          => $input->param('searchtype') || 'contain',
     searchfieldstype    => $searchfieldstype,
     PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
     view                => $view,
-- 
2.39.5