Bugzilla – Attachment 58239 Details for
Bug 17374
Make use of fields from syspref 'DefaultPatronSearchFields' in patron search fields dropdown
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17374 - Make use of fields from syspref 'DefaultPatronSearchFields' in patron search fields dropdown
Bug-17374---Make-use-of-fields-from-syspref-Defaul.patch (text/plain), 9.61 KB, created by
Marc Véron
on 2016-12-16 09:31:34 UTC
(
hide
)
Description:
Bug 17374 - Make use of fields from syspref 'DefaultPatronSearchFields' in patron search fields dropdown
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2016-12-16 09:31:34 UTC
Size:
9.61 KB
patch
obsolete
>From 471900f5d27fe23bae3605fe4bd5e6f9a5ade5f2 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >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 >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >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 > >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../prog/en/includes/patron-search.inc | 62 ++++-------------- > .../prog/en/includes/patronfields.inc | 74 ++++++++++++++++++++++ > 2 files changed, 86 insertions(+), 50 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc > >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 337f550..3edae08 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -1,6 +1,7 @@ > [% USE Koha %] > [% USE Branches %] > [% USE Categories %] >+[% PROCESS 'patronfields.inc' %] > <div class="gradient"> > <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Patrons Resident Search Box --> > <div id="header_search"> >@@ -14,62 +15,23 @@ > > <input value="Search" class="submit" type="submit" /> > >+ > <div id="filters"> > <p><label for="searchfieldstype">Search fields:</label> > <select name="searchfieldstype" id="searchfieldstype"> >- [% IF searchfieldstype == "standard" %] >- <option selected="selected" value='standard'>Standard</option> >- [% ELSE %] >- <option value='standard'>Standard</option> >- [% END %] >- [% IF searchfieldstype == "surname" %] >- <option selected="selected" value='surname'>Surname</option> >- [% ELSE %] >- <option value='surname'>Surname</option> >- [% END %] >- [% IF searchfieldstype == "email" %] >- <option selected="selected" value='email'>Email</option> >- [% ELSE %] >- <option value='email'>Email</option> >- [% END %] >- [% IF searchfieldstype == "borrowernumber" %] >- <option selected="selected" value='borrowernumber'>Borrower number</option> >- [% 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 %] >- <option value='phone'>Phone number</option> >- [% END %] >- [% IF searchfieldstype == "address" %] >- <option selected="selected" value='address'>Street Address</option> >- [% ELSE %] >- <option value='address'>Street Address</option> >- [% END %] >- [% IF searchfieldstype == "dateofbirth" %] >- <option selected="selected" value='dateofbirth'>Date of birth</option> >- [% ELSE %] >- <option value='dateofbirth'>Date of birth</option> >- [% END %] >- [% IF searchfieldstype == "sort1" %] >- <option selected="selected" value='sort1'>Sort field 1</option> >- [% ELSE %] >- <option value='sort1'>Sort field 1</option> >- [% END %] >- [% IF searchfieldstype == "sort2" %] >- <option selected="selected" value='sort2'>Sort field 2</option> >- [% ELSE %] >- <option value='sort2'>Sort field 2</option> >+ [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %] >+ [% default_fields = [ 'standard', 'surname', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %] >+ [% search_options = default_fields.merge(pref_fields).unique %] >+ [% FOREACH s_o IN search_options %] >+ [% display_name = PROCESS patron_fields name=s_o %] >+ [% IF searchfieldstype == s_o %] >+ <option selected="selected" value=[% s_o %]>[% display_name %]</option> >+ [% ELSE %] >+ <option value=[% s_o %]>[% display_name %]</option> >+ [% END %] > [% END %] > </select> > </p> >- > <p> > <label for="searchtype">Search type:</label> > <select name="searchtype" id="searchtype"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >new file mode 100644 >index 0000000..e5bbf3d >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >@@ -0,0 +1,74 @@ >+[% BLOCK patron_fields -%] >+ [% SWITCH name %] >+ [%- CASE 'standard' -%]<span>Standard</span> >+ [%- CASE 'borrowernumber' -%]<span>Borrower number</span> >+ [%- CASE 'cardnumber' -%]<span>Card number</span> >+ [%- CASE 'surname' -%]<span>Surname</span> >+ [%- CASE 'firstname' -%]<span>First name</span> >+ [%- CASE 'title' -%]<span>Title</span> >+ [%- CASE 'othernames' -%]<span>Other names</span> >+ [%- CASE 'initials' -%]<span>Initials</span> >+ [%- CASE 'streetnumber' -%]<span>Street number</span> >+ [%- CASE 'streettype' -%]<span>Street type</span> >+ [%- CASE 'address' -%]<span>Address</span> >+ [%- CASE 'address2' -%]<span>Address line 2</span> >+ [%- CASE 'city' -%]<span>City</span> >+ [%- CASE 'state' -%]<span>State</span> >+ [%- CASE 'zipcode' -%]<span>Zip code</span> >+ [%- CASE 'country' -%]<span>Country</span> >+ [%- CASE 'email' -%]<span>Email</span> >+ [%- CASE 'phone' -%]<span>Phone</span> >+ [%- CASE 'mobile' -%]<span>Mobile phone</span> >+ [%- CASE 'fax' -%]<span>Fax</span> >+ [%- CASE 'emailpro' -%]<span>Secondary email</span> >+ [%- CASE 'phonepro' -%]<span>Secondary phone</span> >+ [%- CASE 'B_streetnumber' -%]<span>Alternate street number</span> >+ [%- CASE 'B_streettype' -%]<span>Alternate street type</span> >+ [%- CASE 'B_address' -%]<span>Alternate address</span> >+ [%- CASE 'B_address2' -%]<span>Alternate address line 2</span> >+ [%- CASE 'B_city' -%]<span>Alternate city</span> >+ [%- CASE 'B_state' -%]<span>Alternate state</span> >+ [%- CASE 'B_zipcode' -%]<span>Alternate zip code</span> >+ [%- CASE 'B_country' -%]<span>Alternate Country</span> >+ [%- CASE 'B_email' -%]<span>Alternate email</span> >+ [%- CASE 'B_phone' -%]<span>Alternate phone</span> >+ [%- CASE 'dateofbirth' -%]<span>Date of birth</span> >+ [%- CASE 'branchcode' -%]<span>Branch code</span> >+ [%- CASE 'categorycode' -%]<span>Category code</span> >+ [%- CASE 'dateenrolled' -%]<span>Registration date</span> >+ [%- CASE 'dateexpiry' -%]<span>Expiration date</span> >+ [%- CASE 'gonenoaddress' -%]<span>Gone no address</span> >+ [%- CASE 'lost' -%]<span>Lost card</span> >+ [%- CASE 'debarred' -%]<span>Restricted</span> >+ [%- CASE 'debarredcomment' -%]<span>Restriction reason</span> >+ [%- CASE 'contactname' -%]<span>Guarantor surname</span> >+ [%- CASE 'contactfirstname' -%]<span>Guarantor firstname</span> >+ [%- CASE 'contacttitle' -%]<span>Guarantor title</span> >+ [%- CASE 'guarantorid' -%]<span>Guarantor ID</span> >+ [%- CASE 'borrowernotes' -%]<span>Circulation Note</span> >+ [%- CASE 'relationship' -%]<span>Guarantor relationship</span> >+ [%- CASE 'sex' -%]<span>Sex</span> >+ [%- CASE 'flags' -%]<span>Permissions (code)</span> >+ [%- CASE 'userid' -%]<span>User name</span> >+ [%- CASE 'opacnote' -%]<span>OPAC note</span> >+ [%- CASE 'contactnote' -%]<span>Contact note</span> >+ [%- CASE 'sort1' -%]<span>Sort field 1</span> >+ [%- CASE 'sort2' -%]<span>Sort field 2</span> >+ [%- CASE 'altcontactfirstname' -%]<span>Alternate contact first name</span> >+ [%- CASE 'altcontactsurname' -%]<span>Alternate contact surname</span> >+ [%- CASE 'altcontactaddress1' -%]<span>Alternate contact address</span> >+ [%- CASE 'altcontactaddress2' -%]<span>Alternate contact address line 2</span> >+ [%- CASE 'altcontactaddress3' -%]<span>Alternate contact city</span> >+ [%- CASE 'altcontactstate' -%]<span>Alternate contact state</span> >+ [%- CASE 'altcontactzipcode' -%]<span>Alternate contact zip code</span> >+ [%- CASE 'altcontactcountry' -%]<span>Alternate contact country</span> >+ [%- CASE 'altcontactphone' -%]<span>Alternate contact phone</span> >+ [%- CASE 'smsalertnumber' -%]<span>SMS alert number</span> >+ [%- CASE 'sms_provider_id' -%]<span>SMS provider</span> >+ [%- CASE 'privacy' -%]<span>Privacy (code)</span> >+ [%- CASE 'privacy_guarantor_checkouts' -%]<span>Guarantor can view checkouts</span> >+ [%- CASE 'updated_on' -%]<span>Last updated</span> >+ [%- CASE 'lastseen' -%]<span>Last seen</span> >+ [%- CASE 'checkprevcheckout' -%]<span>Check previous checkout</span> >+ [%- END -%] >+[%- END -%] >-- >2.1.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 17374
:
56921
|
56931
|
56958
|
58239
|
66400
|
70226
|
71536
|
71597
|
71598
|
71599
|
71600
|
74828
|
93226
|
94831
|
94876
|
94890
|
94891
|
94892
|
96341
|
96342
|
96343
|
96679
|
98106
|
98478
|
100436
|
100437
|
100438
|
100439