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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc (-2 / +6 lines)
Lines 5-11 Link Here
5
         * Format the patron response from a Koha RESTful API request.
5
         * Format the patron response from a Koha RESTful API request.
6
         * @param  {Object}  patron  The patron json object as returned from the Koha RESTful API
6
         * @param  {Object}  patron  The patron json object as returned from the Koha RESTful API
7
         * @param  {Object}  config  A configuration object
7
         * @param  {Object}  config  A configuration object
8
         *                           Valid keys are: `invert_name`, `display_cardnumber` and `url`
8
         *                           Valid keys are: `invert_name`, `display_cardnumber`, `url`
9
         *                           and `showlegal`.
9
         * @return {string}          The formatted HTML string
10
         * @return {string}          The formatted HTML string
10
         */
11
         */
11
        window.$patron_to_html = function (patron, config) {
12
        window.$patron_to_html = function (patron, config) {
Lines 22-34 Link Here
22
            var firstname = escape_str(patron.firstname);
23
            var firstname = escape_str(patron.firstname);
23
            var preferred_name = escape_str(patron.preferred_name);
24
            var preferred_name = escape_str(patron.preferred_name);
24
            var surname = escape_str(patron.surname);
25
            var surname = escape_str(patron.surname);
26
            var showFirstIfDifferentThanPreferred = [% Koha.Preference('ShowFirstIfDifferentThanPreferred') | html %];
25
27
26
            if (patron.middle_name != null && patron.middle_name != "") {
28
            if (patron.middle_name != null && patron.middle_name != "") {
27
                firstname += " " + escape_str(patron.middle_name);
29
                firstname += " " + escape_str(patron.middle_name);
28
                preferred_name += " " + escape_str(patron.middle_name);
30
                preferred_name += " " + escape_str(patron.middle_name);
29
            }
31
            }
30
32
31
            if (patron.other_name != null && patron.other_name != "") {
33
            if (showFirstIfDifferentThanPreferred && config && config.showlegal && patron.preferred_name != patron.firstname) {
34
                preferred_name += " [" + escape_str(patron.firstname) + "]";
35
            } else if (patron.other_name != null && patron.other_name != "") {
32
                firstname += " (" + escape_str(patron.other_name) + ")";
36
                firstname += " (" + escape_str(patron.other_name) + ")";
33
                preferred_name += " (" + escape_str(patron.other_name) + ")";
37
                preferred_name += " (" + escape_str(patron.other_name) + ")";
34
            }
38
            }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc (+1 lines)
Lines 74-79 Link Here
74
    var extendedPatronAttributes = "[% Koha.Preference('ExtendedPatronAttributes') | html %]";
74
    var extendedPatronAttributes = "[% Koha.Preference('ExtendedPatronAttributes') | html %]";
75
    var loggedInLibrary = '[% Branches.GetLoggedInBranchcode | html %]';
75
    var loggedInLibrary = '[% Branches.GetLoggedInBranchcode | html %]';
76
    var singleBranchMode = '[% singleBranchMode | html %]';
76
    var singleBranchMode = '[% singleBranchMode | html %]';
77
    var showFirstIfDifferentThanPreferred = [% Koha.Preference('ShowFirstIfDifferentThanPreferred') | html %];
77
</script>
78
</script>
78
[% IF ( PatronAutoComplete ) %]
79
[% IF ( PatronAutoComplete ) %]
79
    <script>
80
    <script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-4 / +4 lines)
Lines 595-603 Link Here
595
                                        let patron_id = encodeURIComponent(row.patron_id);
595
                                        let patron_id = encodeURIComponent(row.patron_id);
596
                                        let r = '';
596
                                        let r = '';
597
                                        [% IF ! open_on_row_click %]
597
                                        [% IF ! open_on_row_click %]
598
                                        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>";
598
                                        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, showlegal: 1 }) + "</a>";
599
                                        [% ELSE %]
599
                                        [% ELSE %]
600
                                        r += $patron_to_html(row, { invert_name: 1 });
600
                                        r += $patron_to_html(row, { invert_name: 1, showlegal: 1 });
601
                                        [% END %]
601
                                        [% END %]
602
                                        r += '<br/>';
602
                                        r += '<br/>';
603
                                        r += '<div class="address"><ul>';
603
                                        r += '<div class="address"><ul>';
Lines 619-627 Link Here
619
                                    "render": function( data, type, row, meta ) {
619
                                    "render": function( data, type, row, meta ) {
620
                                        let patron_id = encodeURIComponent(row.patron_id);
620
                                        let patron_id = encodeURIComponent(row.patron_id);
621
                                        [% IF ! open_on_row_click %]
621
                                        [% IF ! open_on_row_click %]
622
                                        return "<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>";
622
                                        return "<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, showlegal: 1 }) + "</a>";
623
                                        [% ELSE %]
623
                                        [% ELSE %]
624
                                        return $patron_to_html(row, { invert_name: 1 });
624
                                        return $patron_to_html(row, { invert_name: 1, showlegal: 1 });
625
                                        [% END %]
625
                                        [% END %]
626
                                    }
626
                                    }
627
                                }
627
                                }
(-)a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js (-3 / +6 lines)
Lines 791-798 function patron_autocomplete(node, options) { Link Here
791
                    " " +
791
                    " " +
792
                    (item.middle_name ? item.middle_name.escapeHtml() : "") +
792
                    (item.middle_name ? item.middle_name.escapeHtml() : "") +
793
                    " " +
793
                    " " +
794
                    (item.other_name
794
                    (showFirstIfDifferentThanPreferred
795
                        ? "(" + item.other_name.escapeHtml() + ")"
795
                        ? item.preferred_name != item.firstname
796
                            ? "[" + item.firstname + "]"
797
                            : item.other_name
798
                              ? "(" + item.other_name.escapeHtml() + ")"
799
                              : ""
796
                        : "") +
800
                        : "") +
797
                    cardnumber.escapeHtml() +
801
                    cardnumber.escapeHtml() +
798
                    " " +
802
                    " " +
799
- 

Return to bug 40245