From 3178e89a459d7c85af3c6851d7399cd6a68c2e10 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 27 Oct 2016 14:21:02 +0000 Subject: [PATCH] Bug 17374: Make use of fields from syspref 'DefaultPatronSearchFields' in patron search fields dropdown This patch preserves the current dropdown choices for patron search and adds fields from the DefaultPatronSearchFields system preference To test: 1 - View the regular patron search and note fields in dropdown 2 - Apply patch, ensure dropdown has not changed 3 - Add fields to DefaultPatronSearchFields, note they are available in dropdown 4 - Ensure existing and new fields search properly --- C4/Utils/DataTables/Members.pm | 17 +++-- ...date_DefaultPatronSearchFields_description.perl | 7 ++ installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/includes/patron-search.inc | 64 ++++-------------- .../prog/en/includes/patronfields.inc | 75 ++++++++++++++++++++++ .../prog/en/modules/admin/preferences/patrons.pref | 2 +- .../prog/en/modules/members/member.tt | 63 ++++-------------- members/member.pl | 2 +- 8 files changed, 122 insertions(+), 110 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug17374_update_DefaultPatronSearchFields_description.perl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm index 9fb539e4f1..5c54fe0c16 100644 --- a/C4/Utils/DataTables/Members.pm +++ b/C4/Utils/DataTables/Members.pm @@ -14,6 +14,7 @@ sub search { my $branchcode = $params->{branchcode}; my $searchtype = $params->{searchtype} || 'contain'; my $searchfieldstype = $params->{searchfieldstype} || 'standard'; + warn $searchfieldstype; my $dt_params = $params->{dt_params}; unless ( $searchmember ) { @@ -85,15 +86,10 @@ sub search { my $searchfields = { standard => C4::Context->preference('DefaultPatronSearchFields') || 'surname,firstname,othernames,cardnumber,userid', - surname => 'surname', email => 'email,emailpro,B_email', borrowernumber => 'borrowernumber', - userid => 'userid', phone => 'phone,phonepro,B_phone,altcontactphone,mobile', address => 'streetnumber,streettype,address,address2,city,state,zipcode,country', - dateofbirth => 'dateofbirth', - sort1 => 'sort1', - sort2 => 'sort2', }; # * is replaced with % for sql @@ -124,11 +120,17 @@ sub search { } my @where_strs_or; - for my $searchfield ( split /,/, $searchfields->{$searchfieldstype} ) { - push @where_strs_or, "borrowers." . $dbh->quote_identifier($searchfield) . " LIKE ?"; + if ( defined $searchfields->{$searchfieldstype} ) { + for my $searchfield ( split /,/, $searchfields->{$searchfieldstype} ) { + push @where_strs_or, "borrowers." . $dbh->quote_identifier($searchfield) . " LIKE ?"; + push @where_args, $term; + } + } else { + push @where_strs_or, "borrowers." . $dbh->quote_identifier($searchfieldstype) . " LIKE ?"; push @where_args, $term; } + if ( $searchfieldstype eq 'standard' and C4::Context->preference('ExtendedPatronAttributes') and $searchmember ) { my $matching_borrowernumbers = C4::Members::Attributes::SearchIdMatchingAttribute($searchmember); @@ -144,6 +146,7 @@ sub search { my $where; $where = " WHERE " . join (" AND ", @where_strs) if @where_strs; + warn $where; my $orderby = dt_build_orderby($dt_params); my $limit; diff --git a/installer/data/mysql/atomicupdate/bug17374_update_DefaultPatronSearchFields_description.perl b/installer/data/mysql/atomicupdate/bug17374_update_DefaultPatronSearchFields_description.perl new file mode 100644 index 0000000000..2a8122a824 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug17374_update_DefaultPatronSearchFields_description.perl @@ -0,0 +1,7 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE systempreferences SET explanation = 'Comma separated list defining the default fields to be used during a patron search using the \"standard\" option. If empty Koha will default to \"surname,firstname,othernames,cardnumber,userid\". Additional fields added to this preference will be added as search options in the dropdown menu on the patron search page.' WHERE variable='DefaultPatronSearchFields' " ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17374 - update description of DefaultPatronSearchFields)\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 5b916426bf..e3ebb45abb 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -143,7 +143,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('DefaultLongOverdueChargeValue', '', NULL, "Charge a lost item to the borrower's account when the LOST value of the item changes to n.", 'integer'), ('DefaultLongOverdueDays', '', NULL, "Set the LOST value of an item when the item has been overdue for more than n days.", 'integer'), ('DefaultLongOverdueLostValue', '', NULL, "Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.", 'integer'), -('DefaultPatronSearchFields', 'surname,firstname,othernames,cardnumber,userid',NULL,'Comma separated list defining the default fields to be used during a patron search','free'), +('DefaultPatronSearchFields', 'surname,firstname,othernames,cardnumber,userid',NULL,'Comma separated list defining the default fields to be used during a patron search using the "standard" option. If empty Koha will default to "surname,firstname,othernames,cardnumber,userid". Additional fields added to this preference will be added as search options in the dropdown menu on the patron search page.','free'), ('defaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'), ('defaultSortOrder','dsc','asc|dsc|az|za','Specify the default sort order','Choice'), ('DefaultToLoggedInLibraryCircRules', '0', NULL , 'If enabled, circ rules editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.', 'YesNo'), 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 bde60b4dd6..507abc62bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -1,7 +1,9 @@ [% USE Koha %] [% USE Branches %] [% USE Categories %] +[% USE raw %] [% PROCESS 'html_helpers.inc' %] +[% PROCESS 'patronfields.inc' %]

[% LibraryName | html %]