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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt (-1 / +1 lines)
Lines 196-202 Link Here
196
                    {
196
                    {
197
                        "data": function(row, type, val, meta) {
197
                        "data": function(row, type, val, meta) {
198
                            let resolved = ( row.resolved_date ) ? true : false;
198
                            let resolved = ( row.resolved_date ) ? true : false;
199
                            let result = '<a class="btn btn-default btn-xs" role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="'+resolved+'"><i class="fa-solid fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>';
199
                            let result = '<a class="btn btn-default btn-xs" role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="'+resolved+'" data-assignee="'+$patron_to_html(row.assignee, { display_cardnumber: false, url: false })+'"><i class="fa-solid fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>';
200
                            return result;
200
                            return result;
201
                        },
201
                        },
202
                        "searchable": false,
202
                        "searchable": false,
(-)a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js (-3 / +14 lines)
Lines 4-9 $(document).ready(function() { Link Here
4
        let button = $(event.relatedTarget);
4
        let button = $(event.relatedTarget);
5
        let ticket_id = button.data('concern');
5
        let ticket_id = button.data('concern');
6
        let resolved  = button.data('resolved');
6
        let resolved  = button.data('resolved');
7
        let assignee  = button.data('assignee');
7
        modal.find('.modal-footer input').val(ticket_id);
8
        modal.find('.modal-footer input').val(ticket_id);
8
9
9
        if ( resolved ) {
10
        if ( resolved ) {
Lines 17-22 $(document).ready(function() { Link Here
17
        // Display ticket details
18
        // Display ticket details
18
        let display = '<div class="list-group">';
19
        let display = '<div class="list-group">';
19
        display += '<div class="list-group-item">';
20
        display += '<div class="list-group-item">';
21
        if (assignee) {
22
            display += '<span class="pull-right"><span class="label">' + __("Assignee") + '</span>: ' + assignee + '</span>';
23
        }
20
        display += '<span class="wrapfix">' + detail + '</span>';
24
        display += '<span class="wrapfix">' + detail + '</span>';
21
        display += '</div>';
25
        display += '</div>';
22
        display += '<div id="concern-updates" class="list-group-item">';
26
        display += '<div id="concern-updates" class="list-group-item">';
Lines 32-38 $(document).ready(function() { Link Here
32
            url: "/api/v1/tickets/" + ticket_id + "/updates",
36
            url: "/api/v1/tickets/" + ticket_id + "/updates",
33
            method: "GET",
37
            method: "GET",
34
            headers: {
38
            headers: {
35
                "x-koha-embed": [ "user", "+strings" ]
39
                "x-koha-embed": [ "user", "assignee", "+strings" ]
36
            },
40
            },
37
        }).success(function(data) {
41
        }).success(function(data) {
38
            let updates_display = $('#concern-updates');
42
            let updates_display = $('#concern-updates');
Lines 52-61 $(document).ready(function() { Link Here
52
                    url: true
56
                    url: true
53
                }) + ' (' + $datetime(item.date) + ')';
57
                }) + ' (' + $datetime(item.date) + ')';
54
                if ( item.status ) {
58
                if ( item.status ) {
55
                    updates += '<span class="wrapfix pull-right">';
59
                    updates += '<span class="clearfix pull-right">';
56
                    updates += item._strings.status ? escape_str(item._strings.status.str) : "";
60
                    updates += item._strings.status ? escape_str(item._strings.status.str) : "";
57
                    updates += '</span>'
61
                    updates += '</span>'
58
                }
62
                }
63
                if ( item.assignee ) {
64
                    updates += '<span class="clearfix pull-right">';
65
                    updates += $patron_to_html(item.assignee, {
66
                                        display_cardnumber: false,
67
                                        url: true
68
                                    });
69
                    updates += '</span>'
70
                }
59
                updates += '</span>';
71
                updates += '</span>';
60
                updates += '</div>';
72
                updates += '</div>';
61
            });
73
            });
62
- 

Return to bug 35657