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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-2 / +2 lines)
Lines 1086-1094 Link Here
1086
                            "data": "title:body",
1086
                            "data": "title:body",
1087
                            "render": function(data, type, row, meta) {
1087
                            "render": function(data, type, row, meta) {
1088
                                let resolved = ( row.resolved_date ) ? true : false;
1088
                                let resolved = ( row.resolved_date ) ? true : false;
1089
                                let result = '<a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="' + resolved + '">' + row.title + '</a>';
1089
                                let result = '<a role="button" href="#" class="detail-trigger">' + row.title + '</a>';
1090
                                if (row.updates_count) {
1090
                                if (row.updates_count) {
1091
                                    result += '<span class="pull-right"><a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
1091
                                    result += '<span class="pull-right"><a class="detail-trigger"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
1092
                                }
1092
                                }
1093
                                result += '<div id="detail_' + row.ticket_id + '" class="hidden">' + row.body + '</div>';
1093
                                result += '<div id="detail_' + row.ticket_id + '" class="hidden">' + row.body + '</div>';
1094
                                return result;
1094
                                return result;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt (-3 / +3 lines)
Lines 142-150 Link Here
142
                        "data": "title:body",
142
                        "data": "title:body",
143
                        "render": function(data, type, row, meta) {
143
                        "render": function(data, type, row, meta) {
144
                            let resolved = ( row.resolved_date ) ? true : false;
144
                            let resolved = ( row.resolved_date ) ? true : false;
145
                            let result = '<a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="'+resolved+'">' + row.title + '</a>';
145
                            let result = '<a role="button" href="#" class="detail-trigger">' + row.title + '</a>';
146
                            if (row.updates_count) {
146
                            if (row.updates_count) {
147
                                result += '<span class="pull-right"><a role="button" href="#" data-toggle="modal" data-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="'+resolved+'"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
147
                                result += '<span class="pull-right"><a role="button" href="#" class="detail-trigger"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
148
                            }
148
                            }
149
                            result += '<div id="detail_' + row.ticket_id + '" class="hidden">' + row.body + '</div>';
149
                            result += '<div id="detail_' + row.ticket_id + '" class="hidden">' + row.body + '</div>';
150
                            return result;
150
                            return result;
Lines 197-203 Link Here
197
                    {
197
                    {
198
                        "data": function(row, type, val, meta) {
198
                        "data": function(row, type, val, meta) {
199
                            let resolved = ( row.resolved_date ) ? true : false;
199
                            let resolved = ( row.resolved_date ) ? true : false;
200
                            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
                            let result = '<a class="btn btn-default btn-xs main-trigger" 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>';
201
                            return result;
201
                            return result;
202
                        },
202
                        },
203
                        "searchable": false,
203
                        "searchable": false,
(-)a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js (-1 / +8 lines)
Lines 1-5 Link Here
1
/* keep tidy */
1
/* keep tidy */
2
$(document).ready(function () {
2
$(document).ready(function () {
3
    $("#table_concerns").on("click", ".detail-trigger", function () {
4
        // Find the main trigger anchor within the same table row
5
        var $mainTrigger = $(this).closest("tr").find(".main-trigger");
6
7
        // Trigger the click event of the main trigger anchor
8
        $mainTrigger.trigger("click");
9
    });
10
3
    $("#ticketDetailsModal").on("show.bs.modal", function (event) {
11
    $("#ticketDetailsModal").on("show.bs.modal", function (event) {
4
        let modal = $(this);
12
        let modal = $(this);
5
        let button = $(event.relatedTarget);
13
        let button = $(event.relatedTarget);
6
- 

Return to bug 36757