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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc (-15 / +1 lines)
Lines 25-45 Link Here
25
25
26
            <div class="form-extra-content">
26
            <div class="form-extra-content">
27
                <div>
27
                <div>
28
                    <label for="searchfieldstype" class="control-label">Search fields</label>
28
                    [% INCLUDE patron_fields_dropdown search_box=1 %]
29
                    <select name="searchfieldstype" id="searchfieldstype" class="form-control">
30
                        [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' %]
31
                        [% default_fields = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
32
                        [% search_options = default_fields.merge(standard.split(',')).unique %]
33
                        [% FOREACH s_o IN search_options %]
34
                            [% display_name = PROCESS patron_fields name=s_o %]
35
                            [% NEXT IF !display_name.length %]
36
                            [% IF searchfieldstype == s_o %]
37
                                <option value="[% s_o | html %]">[% display_name | $raw %]</option>
38
                            [% ELSE %]
39
                                <option value="[% s_o | html %]">[% display_name | $raw %]</option>
40
                            [% END %]
41
                        [% END %]
42
                    </select>
43
                </div>
29
                </div>
44
30
45
                <div>
31
                <div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-15 / +1 lines)
Lines 58-78 Link Here
58
                        </li>
58
                        </li>
59
                    [% CASE 'search_field' %]
59
                    [% CASE 'search_field' %]
60
                        <li>
60
                        <li>
61
                            <label for="searchfieldstype_filter">Search field:</label>
61
                            [% INCLUDE patron_fields_dropdown %]
62
                            <select name="searchfieldstype" id="searchfieldstype_filter">
63
                                [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' %]
64
                                [% default_fields = [ standard, 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
65
                                [% search_options = default_fields.merge(standard.split(',')).unique %]
66
                                [% FOREACH s_o IN search_options %]
67
                                    [% display_name = PROCESS patron_fields name=s_o %]
68
                                    [% NEXT IF !display_name %]
69
                                    [% IF searchfieldstype == s_o %]
70
                                        <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option>
71
                                    [% ELSE %]
72
                                        <option value=[% s_o | html %]>[% display_name | $raw %]</option>
73
                                    [% END %]
74
                                [% END %]
75
                            </select>
76
                        </li>
62
                        </li>
77
                    [% CASE 'search_type' %]
63
                    [% CASE 'search_type' %]
78
                        <li>
64
                        <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc (-1 / +28 lines)
Lines 1-6 Link Here
1
[%- BLOCK patron_fields -%]
1
[%- BLOCK patron_fields -%]
2
     [%- SWITCH name -%]
2
     [%- SWITCH name -%]
3
     [%- CASE standard -%]<span>Standard</span>
3
     [%- CASE standard -%]<span>Standard</span>
4
     [%- CASE full_address -%]<span>Full address</span>
5
     [%- CASE all_emails -%]<span>All emails</span>
6
     [%- CASE all_phones -%]<span>All phones</span>
4
     [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
7
     [%- CASE 'borrowernumber' -%]<span>Borrowernumber</span>
5
     [%- CASE 'cardnumber' -%]<span>Card number</span>
8
     [%- CASE 'cardnumber' -%]<span>Card number</span>
6
     [%- CASE 'surname' -%]<span>Surname</span>
9
     [%- CASE 'surname' -%]<span>Surname</span>
Lines 75-77 Link Here
75
     [%- CASE DEFAULT -%]
78
     [%- CASE DEFAULT -%]
76
     [%- END -%]
79
     [%- END -%]
77
[%- END -%]
80
[%- END -%]
78
- 
81
[%- BLOCK patron_fields_dropdown -%]
82
    [% IF search_box %]
83
        <label for="searchfieldstype" class="control-label">Search field:</label>
84
        <select name="searchfieldstype" id="searchfieldstype" class="form-control">
85
    [% ELSE %]
86
        <label for="searchfieldstype_filter">Search field:</label>
87
        <select name="searchfieldstype" id="searchfieldstype_filter">
88
    [% END %]
89
        [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' %]
90
        [% SET full_address = 'streetnumber,streettype,address,address2,city,state,zipcode,country' %]
91
        [% SET all_emails = 'email,emailpro,B_email' %]
92
        [% SET all_phones = 'phone,phonepro,B_phone,altcontactphone,mobile' %]
93
        [% default_fields = [ standard, 'surname', 'cardnumber', all_emails, 'borrowernumber', 'userid', all_phone, full_address, 'dateofbirth', 'sort1', 'sort2' ] %]
94
        [% search_options = default_fields.merge(standard.split(',')).unique %]
95
        [% FOREACH s_o IN search_options %]
96
            [% display_name = PROCESS patron_fields name=s_o %]
97
            [% NEXT IF !display_name %]
98
            [% IF searchfieldstype == s_o %]
99
                <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option>
100
            [% ELSE %]
101
                <option value=[% s_o | html %]>[% display_name | $raw %]</option>
102
            [% END %]
103
        [% END %]
104
    </select>
105
[%- END -%]

Return to bug 32770