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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc (-2 / +4 lines)
Lines 20-35 Link Here
20
20
21
            var name;
21
            var name;
22
            var firstname = escape_str(patron.firstname);
22
            var firstname = escape_str(patron.firstname);
23
            var preferred_name = escape_str(patron.preferred_name);
23
            var surname   = escape_str(patron.surname);
24
            var surname   = escape_str(patron.surname);
25
            var effective_name = preferred_name || firstname;
24
26
25
            if ( patron.other_name != null && patron.other_name != '' ) {
27
            if ( patron.other_name != null && patron.other_name != '' ) {
26
                firstname += ' (' + escape_str(patron.other_name) + ')';
28
                firstname += ' (' + escape_str(patron.other_name) + ')';
27
            }
29
            }
28
            if ( config && config.invert_name ) {
30
            if ( config && config.invert_name ) {
29
                name = surname + ( firstname ? ', ' + firstname : '' );
31
                name = surname + ( effective_name ? ', ' + effective_name : '' );
30
            }
32
            }
31
            else {
33
            else {
32
                name = firstname + ' ' + surname;
34
                name = effective_name + ' ' + surname;
33
            }
35
            }
34
36
35
            if ( config && config.display_cardnumber ) {
37
            if ( config && config.display_cardnumber ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc (-1 / +1 lines)
Lines 24-30 Link Here
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
              [% pref_fields = Koha.Preference('DefaultPatronSearchFields').split(',') %]
27
              [% default_fields = [ 'firstname,surname,othernames,cardnumber,userid', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
27
              [% default_fields = [ 'firstname,surname,preferred_name,othernames,cardnumber,userid', 'surname', 'cardnumber', 'email', 'borrowernumber', 'userid', 'phone', 'address', 'dateofbirth', 'sort1', 'sort2' ] %]
28
              [% search_options = default_fields.merge(pref_fields).unique %]
28
              [% search_options = default_fields.merge(pref_fields).unique %]
29
              [% FOREACH s_o IN search_options %]
29
              [% FOREACH s_o IN search_options %]
30
                  [% display_name = PROCESS patron_fields name=s_o %]
30
                  [% display_name = PROCESS patron_fields name=s_o %]
(-)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 'firstname,surname,preferred_name,othernames,cardnumber,userid' -%]<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 28633