Bugzilla – Attachment 74828 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: (follow-up) Remove spaces from include file
Bug-17374-follow-up-Remove-spaces-from-include-fil.patch (text/plain), 9.51 KB, created by
Nick Clemens (kidclamp)
on 2018-04-24 19:05:37 UTC
(
hide
)
Description:
Bug 17374: (follow-up) Remove spaces from include file
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2018-04-24 19:05:37 UTC
Size:
9.51 KB
patch
obsolete
>From 35ca59ce5467cf64e44a16465c89c15e398628aa Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 24 Apr 2018 19:03:26 +0000 >Subject: [PATCH] Bug 17374: (follow-up) Remove spaces from include file > >--- > .../prog/en/includes/patronfields.inc | 146 ++++++++++----------- > .../prog/en/modules/members/member.tt | 2 +- > 2 files changed, 74 insertions(+), 74 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >index ef8f777..bce33ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >@@ -1,75 +1,75 @@ > [% 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> >- [%- CASE DEFAULT -%] >- [%- END -%] >+[% 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> >+[%- CASE DEFAULT -%] >+[%- END -%] > [%- END -%] >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 ad7d29a..0486f65 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -135,7 +135,7 @@ > [% search_options = default_fields.merge(pref_fields).unique %] > [% FOREACH s_o IN search_options %] > [% display_name = PROCESS patron_fields name=s_o %] >- [% NEXT IF display_name.length == 5 %] >+ [% NEXT IF !display_name %] > [% IF searchfieldstype == s_o %] > <option selected="selected" value=[% s_o %]>[% display_name %]</option> > [% ELSE %] >-- >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