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

(-)a/koha-tmpl/intranet-tmpl/prog/js/patron-format.js (-8 / +18 lines)
Lines 19-25 Link Here
19
                "</span>";
19
                "</span>";
20
        }
20
        }
21
21
22
        var name;
23
        var firstname = escape_str(patron.firstname);
22
        var firstname = escape_str(patron.firstname);
24
        var preferred_name = escape_str(patron.preferred_name);
23
        var preferred_name = escape_str(patron.preferred_name);
25
        var surname = escape_str(patron.surname);
24
        var surname = escape_str(patron.surname);
Lines 33-43 Link Here
33
            firstname += " (" + escape_str(patron.other_name) + ")";
32
            firstname += " (" + escape_str(patron.other_name) + ")";
34
            preferred_name += " (" + escape_str(patron.other_name) + ")";
33
            preferred_name += " (" + escape_str(patron.other_name) + ")";
35
        }
34
        }
36
        if (config && config.invert_name) {
35
37
            name = surname + (preferred_name ? ", " + preferred_name : "");
36
        const nameParts = [];
37
        if (config?.invert_name) {
38
            // Invert: "Surname, Preferred"
39
            if (surname) nameParts.push(surname);
40
            if (preferred_name)
41
                nameParts.push(
42
                    surname ? ", " + preferred_name : preferred_name
43
                );
44
            name = nameParts.join("");
38
        } else {
45
        } else {
39
            name = preferred_name + " " + surname;
46
            // Normal: "Preferred Surname"
47
            if (preferred_name) nameParts.push(preferred_name);
48
            if (surname) nameParts.push(surname);
49
            name = nameParts.join(" ");
40
        }
50
        }
51
41
        if (name.replace(" ", "").length == 0) {
52
        if (name.replace(" ", "").length == 0) {
42
            if (patron.library) {
53
            if (patron.library) {
43
                return _("A patron from %s").format(patron.library.name);
54
                return _("A patron from %s").format(patron.library.name);
Lines 46-56 Link Here
46
            }
57
            }
47
        }
58
        }
48
59
49
        if (config && config.hide_patron_name) {
60
        if (config?.hide_patron_name) {
50
            name = "";
61
            name = "";
51
        }
62
        }
52
63
53
        if (config && config.display_cardnumber) {
64
        if (config?.display_cardnumber) {
54
            if (name.length > 0) {
65
            if (name.length > 0) {
55
                name = name + " (" + escape_str(patron.cardnumber) + ")";
66
                name = name + " (" + escape_str(patron.cardnumber) + ")";
56
            } else {
67
            } else {
Lines 58-64 Link Here
58
            }
69
            }
59
        }
70
        }
60
71
61
        if (config && config.url) {
72
        if (config?.url) {
62
            if (config.url === "circulation_reserves") {
73
            if (config.url === "circulation_reserves") {
63
                name =
74
                name =
64
                    '<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=' +
75
                    '<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=' +
65
- 

Return to bug 32176