From 35ca59ce5467cf64e44a16465c89c15e398628aa Mon Sep 17 00:00:00 2001 From: Nick Clemens 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' -%]Standard - [%- CASE 'borrowernumber' -%]Borrower number - [%- CASE 'cardnumber' -%]Card number - [%- CASE 'surname' -%]Surname - [%- CASE 'firstname' -%]First name - [%- CASE 'title' -%]Title - [%- CASE 'othernames' -%]Other names - [%- CASE 'initials' -%]Initials - [%- CASE 'streetnumber' -%]Street number - [%- CASE 'streettype' -%]Street type - [%- CASE 'address' -%]Address - [%- CASE 'address2' -%]Address line 2 - [%- CASE 'city' -%]City - [%- CASE 'state' -%]State - [%- CASE 'zipcode' -%]Zip code - [%- CASE 'country' -%]Country - [%- CASE 'email' -%]Email - [%- CASE 'phone' -%]Phone - [%- CASE 'mobile' -%]Mobile phone - [%- CASE 'fax' -%]Fax - [%- CASE 'emailpro' -%]Secondary email - [%- CASE 'phonepro' -%]Secondary phone - [%- CASE 'B_streetnumber' -%]Alternate street number - [%- CASE 'B_streettype' -%]Alternate street type - [%- CASE 'B_address' -%]Alternate address - [%- CASE 'B_address2' -%]Alternate address line 2 - [%- CASE 'B_city' -%]Alternate city - [%- CASE 'B_state' -%]Alternate state - [%- CASE 'B_zipcode' -%]Alternate zip code - [%- CASE 'B_country' -%]Alternate Country - [%- CASE 'B_email' -%]Alternate email - [%- CASE 'B_phone' -%]Alternate phone - [%- CASE 'dateofbirth' -%]Date of birth - [%- CASE 'branchcode' -%]Branch code - [%- CASE 'categorycode' -%]Category code - [%- CASE 'dateenrolled' -%]Registration date - [%- CASE 'dateexpiry' -%]Expiration date - [%- CASE 'gonenoaddress' -%]Gone no address - [%- CASE 'lost' -%]Lost card - [%- CASE 'debarred' -%]Restricted - [%- CASE 'debarredcomment' -%]Restriction reason - [%- CASE 'contactname' -%]Guarantor surname - [%- CASE 'contactfirstname' -%]Guarantor firstname - [%- CASE 'contacttitle' -%]Guarantor title - [%- CASE 'guarantorid' -%]Guarantor ID - [%- CASE 'borrowernotes' -%]Circulation Note - [%- CASE 'relationship' -%]Guarantor relationship - [%- CASE 'sex' -%]Sex - [%- CASE 'flags' -%]Permissions (code) - [%- CASE 'userid' -%]User name - [%- CASE 'opacnote' -%]OPAC note - [%- CASE 'contactnote' -%]Contact note - [%- CASE 'sort1' -%]Sort field 1 - [%- CASE 'sort2' -%]Sort field 2 - [%- CASE 'altcontactfirstname' -%]Alternate contact first name - [%- CASE 'altcontactsurname' -%]Alternate contact surname - [%- CASE 'altcontactaddress1' -%]Alternate contact address - [%- CASE 'altcontactaddress2' -%]Alternate contact address line 2 - [%- CASE 'altcontactaddress3' -%]Alternate contact city - [%- CASE 'altcontactstate' -%]Alternate contact state - [%- CASE 'altcontactzipcode' -%]Alternate contact zip code - [%- CASE 'altcontactcountry' -%]Alternate contact country - [%- CASE 'altcontactphone' -%]Alternate contact phone - [%- CASE 'smsalertnumber' -%]SMS alert number - [%- CASE 'sms_provider_id' -%]SMS provider - [%- CASE 'privacy' -%]Privacy (code) - [%- CASE 'privacy_guarantor_checkouts' -%]Guarantor can view checkouts - [%- CASE 'updated_on' -%]Last updated - [%- CASE 'lastseen' -%]Last seen - [%- CASE 'checkprevcheckout' -%]Check previous checkout - [%- CASE DEFAULT -%] - [%- END -%] +[% SWITCH name %] +[%- CASE 'standard' -%]Standard +[%- CASE 'borrowernumber' -%]Borrower number +[%- CASE 'cardnumber' -%]Card number +[%- CASE 'surname' -%]Surname +[%- CASE 'firstname' -%]First name +[%- CASE 'title' -%]Title +[%- CASE 'othernames' -%]Other names +[%- CASE 'initials' -%]Initials +[%- CASE 'streetnumber' -%]Street number +[%- CASE 'streettype' -%]Street type +[%- CASE 'address' -%]Address +[%- CASE 'address2' -%]Address line 2 +[%- CASE 'city' -%]City +[%- CASE 'state' -%]State +[%- CASE 'zipcode' -%]Zip code +[%- CASE 'country' -%]Country +[%- CASE 'email' -%]Email +[%- CASE 'phone' -%]Phone +[%- CASE 'mobile' -%]Mobile phone +[%- CASE 'fax' -%]Fax +[%- CASE 'emailpro' -%]Secondary email +[%- CASE 'phonepro' -%]Secondary phone +[%- CASE 'B_streetnumber' -%]Alternate street number +[%- CASE 'B_streettype' -%]Alternate street type +[%- CASE 'B_address' -%]Alternate address +[%- CASE 'B_address2' -%]Alternate address line 2 +[%- CASE 'B_city' -%]Alternate city +[%- CASE 'B_state' -%]Alternate state +[%- CASE 'B_zipcode' -%]Alternate zip code +[%- CASE 'B_country' -%]Alternate Country +[%- CASE 'B_email' -%]Alternate email +[%- CASE 'B_phone' -%]Alternate phone +[%- CASE 'dateofbirth' -%]Date of birth +[%- CASE 'branchcode' -%]Branch code +[%- CASE 'categorycode' -%]Category code +[%- CASE 'dateenrolled' -%]Registration date +[%- CASE 'dateexpiry' -%]Expiration date +[%- CASE 'gonenoaddress' -%]Gone no address +[%- CASE 'lost' -%]Lost card +[%- CASE 'debarred' -%]Restricted +[%- CASE 'debarredcomment' -%]Restriction reason +[%- CASE 'contactname' -%]Guarantor surname +[%- CASE 'contactfirstname' -%]Guarantor firstname +[%- CASE 'contacttitle' -%]Guarantor title +[%- CASE 'guarantorid' -%]Guarantor ID +[%- CASE 'borrowernotes' -%]Circulation Note +[%- CASE 'relationship' -%]Guarantor relationship +[%- CASE 'sex' -%]Sex +[%- CASE 'flags' -%]Permissions (code) +[%- CASE 'userid' -%]User name +[%- CASE 'opacnote' -%]OPAC note +[%- CASE 'contactnote' -%]Contact note +[%- CASE 'sort1' -%]Sort field 1 +[%- CASE 'sort2' -%]Sort field 2 +[%- CASE 'altcontactfirstname' -%]Alternate contact first name +[%- CASE 'altcontactsurname' -%]Alternate contact surname +[%- CASE 'altcontactaddress1' -%]Alternate contact address +[%- CASE 'altcontactaddress2' -%]Alternate contact address line 2 +[%- CASE 'altcontactaddress3' -%]Alternate contact city +[%- CASE 'altcontactstate' -%]Alternate contact state +[%- CASE 'altcontactzipcode' -%]Alternate contact zip code +[%- CASE 'altcontactcountry' -%]Alternate contact country +[%- CASE 'altcontactphone' -%]Alternate contact phone +[%- CASE 'smsalertnumber' -%]SMS alert number +[%- CASE 'sms_provider_id' -%]SMS provider +[%- CASE 'privacy' -%]Privacy (code) +[%- CASE 'privacy_guarantor_checkouts' -%]Guarantor can view checkouts +[%- CASE 'updated_on' -%]Last updated +[%- CASE 'lastseen' -%]Last seen +[%- CASE 'checkprevcheckout' -%]Check previous checkout +[%- 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 %] [% ELSE %] -- 2.1.4