View | Details | Raw Unified | Return to bug 30576
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc (-3 / +2 lines)
Lines 23-31 Link Here
23
    <div id="filters">
23
    <div id="filters">
24
        <p><label for="searchfieldstype">Search fields:</label>
24
        <p><label for="searchfieldstype">Search fields:</label>
25
            <select name="searchfieldstype" id="searchfieldstype">
25
            <select name="searchfieldstype" id="searchfieldstype">
26
              [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
26
              [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,surname,othernames,cardnumber,userid' %]
27
              [% default_fields = [ 'firstname,surname,othernames,cardnumber,userid', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
27
              [% SET search_options = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
28
              [% search_options = default_fields.merge(pref_fields).unique %]
29
              [% FOREACH s_o IN search_options %]
28
              [% FOREACH s_o IN search_options %]
30
                  [% display_name = PROCESS patron_fields name=s_o %]
29
                  [% display_name = PROCESS patron_fields name=s_o %]
31
                  [% NEXT IF !display_name.length %]
30
                  [% NEXT IF !display_name.length %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-3 / +2 lines)
Lines 60-68 Link Here
60
                        <li>
60
                        <li>
61
                            <label for="searchfieldstype_filter">Search field:</label>
61
                            <label for="searchfieldstype_filter">Search field:</label>
62
                            <select name="searchfieldstype" id="searchfieldstype_filter">
62
                            <select name="searchfieldstype" id="searchfieldstype_filter">
63
                                [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
63
                                [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,surname,othernames,cardnumber,userid' %]
64
                                [% default_fields = [ 'firstname,surname,othernames,cardnumber,userid', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
64
                                [% SET search_options = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
65
                                [% search_options = default_fields.merge(pref_fields).unique %]
66
                                [% FOREACH s_o IN search_options %]
65
                                [% FOREACH s_o IN search_options %]
67
                                    [% display_name = PROCESS patron_fields name=s_o %]
66
                                    [% display_name = PROCESS patron_fields name=s_o %]
68
                                    [% NEXT IF !display_name %]
67
                                    [% NEXT IF !display_name %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc (-2 / +1 lines)
Lines 1-6 Link Here
1
[%- BLOCK patron_fields -%]
1
[%- BLOCK patron_fields -%]
2
     [%- SWITCH name -%]
2
     [%- SWITCH name -%]
3
     [%- CASE 'firstname,surname,othernames,cardnumber,userid' -%]<span>Standard</span>
3
     [%- CASE standard -%]<span>Standard</span>
4
     [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
4
     [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
5
     [%- CASE 'cardnumber' -%]<span>Card number</span>
5
     [%- CASE 'cardnumber' -%]<span>Card number</span>
6
     [%- CASE 'surname' -%]<span>Surname</span>
6
     [%- CASE 'surname' -%]<span>Surname</span>
7
- 

Return to bug 30576