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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc (+1 lines)
Lines 75-80 Link Here
75
    var extendedPatronAttributes = "[% Koha.Preference('ExtendedPatronAttributes') | html %]";
75
    var extendedPatronAttributes = "[% Koha.Preference('ExtendedPatronAttributes') | html %]";
76
    var loggedInLibrary = '[% Branches.GetLoggedInBranchcode | html %]';
76
    var loggedInLibrary = '[% Branches.GetLoggedInBranchcode | html %]';
77
    var singleBranchMode = '[% singleBranchMode | html %]';
77
    var singleBranchMode = '[% singleBranchMode | html %]';
78
    var showPatronFirstnameIfDifferentThanPreferredname = [% Koha.Preference('ShowPatronFirstnameIfDifferentThanPreferredname') ? 1 : 0 | html %];
78
</script>
79
</script>
79
[% IF ( PatronAutoComplete ) %]
80
[% IF ( PatronAutoComplete ) %]
80
    <script>
81
    <script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-2 / +3 lines)
Lines 594-602 Link Here
594
                                        let patron_id = encodeURIComponent(row.patron_id);
594
                                        let patron_id = encodeURIComponent(row.patron_id);
595
                                        let r = '';
595
                                        let r = '';
596
                                        [% IF ! open_on_row_click %]
596
                                        [% IF ! open_on_row_click %]
597
                                        r += "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=" + patron_id + "\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">" + $patron_to_html(row, { invert_name: 1 }) + "</a>";
597
                                        r += "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=" + patron_id + "\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">"
598
                                            + $patron_to_html(row, { invert_name: 1, showDiffFirstname: [% Koha.Preference('ShowPatronFirstnameIfDifferentThanPreferredname') ? 1 : 0 | html %] }) + "</a>";
598
                                        [% ELSE %]
599
                                        [% ELSE %]
599
                                        r += $patron_to_html(row, { invert_name: 1 });
600
                                        r += $patron_to_html(row, { invert_name: 1, showDiffFirstname: [% Koha.Preference('ShowPatronFirstnameIfDifferentThanPreferredname') ? 1 : 0 | html %] });
600
                                        [% END %]
601
                                        [% END %]
601
                                        r += '<br/>';
602
                                        r += '<br/>';
602
                                        r += '<div class="address"><ul>';
603
                                        r += '<div class="address"><ul>';
(-)a/koha-tmpl/intranet-tmpl/prog/js/patron-format.js (-1 / +11 lines)
Lines 3-9 Link Here
3
     * Format the patron response from a Koha RESTful API request.
3
     * Format the patron response from a Koha RESTful API request.
4
     * @param  {Object}  patron  The patron json object as returned from the Koha RESTful API
4
     * @param  {Object}  patron  The patron json object as returned from the Koha RESTful API
5
     * @param  {Object}  config  A configuration object
5
     * @param  {Object}  config  A configuration object
6
     *                           Valid keys are: `invert_name`, `display_cardnumber` and `url`
6
     *                           Valid keys are: `invert_name`, `display_cardnumber', `url`
7
     *                           and `showDiffFirstname`
7
     * @return {string}          The formatted HTML string
8
     * @return {string}          The formatted HTML string
8
     */
9
     */
9
    window.$patron_to_html = function (patron, config) {
10
    window.$patron_to_html = function (patron, config) {
Lines 33-38 Link Here
33
            preferred_name += " (" + escape_str(patron.other_name) + ")";
34
            preferred_name += " (" + escape_str(patron.other_name) + ")";
34
        }
35
        }
35
36
37
        if (
38
            config &&
39
            config.showDiffFirstname &&
40
            patron.preferred_name != patron.firstname
41
        ) {
42
            preferred_name +=
43
                " <em>[" + escape_str(patron.firstname) + "]</em>";
44
        }
45
36
        const nameParts = [];
46
        const nameParts = [];
37
        if (config?.invert_name) {
47
        if (config?.invert_name) {
38
            // Invert: "Surname, Preferred"
48
            // Invert: "Surname, Preferred"
(-)a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js (-1 / +2 lines)
Lines 804-809 function patron_autocomplete(node, options) { Link Here
804
                    $patron_to_html(item, {
804
                    $patron_to_html(item, {
805
                        display_cardnumber: true,
805
                        display_cardnumber: true,
806
                        invert_name: true,
806
                        invert_name: true,
807
                        showDiffFirstname:
808
                            showPatronFirstnameIfDifferentThanPreferredname,
807
                    }) +
809
                    }) +
808
                    " " +
810
                    " " +
809
                    (item.date_of_birth
811
                    (item.date_of_birth
810
- 

Return to bug 40245