From 08f1bde3cff736b0c049ee0d2725c4c1c8d7118f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 3 Nov 2025 16:16:49 +0100 Subject: [PATCH] Bug 41172: Fix sort indicator display on the checkouts table --- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 95 ++++++++++---------- 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 185a5488db5..e322f6688df 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -90,55 +90,60 @@ function LoadIssuesTable() { visible: false, }, { - orderData: 2, // Sort on hidden unformatted date due column - data: function (oObj) { - let date_due_formatted = $datetime(oObj.date_due, { - as_due_date: true, - no_tz_adjust: true, - }); - var due = oObj.date_due_overdue - ? "" + - date_due_formatted + - "" - : oObj.date_due_today - ? "" + - date_due_formatted + - "" - : date_due_formatted; - - due = - "" + - due + - ""; - - if (oObj.lost && oObj.claims_returned) { - due += - "" + - oObj.lost.escapeHtml() + - ""; - } else if (oObj.lost) { - due += - "" + - oObj.lost.escapeHtml() + + data: { + _: function (row, type, set, meta) { + let oObj = row; + let date_due_formatted = $datetime(oObj.date_due, { + as_due_date: true, + no_tz_adjust: true, + }); + var due = oObj.date_due_overdue + ? "" + + date_due_formatted + + "" + : oObj.date_due_today + ? "" + + date_due_formatted + + "" + : date_due_formatted; + + due = + "" + + due + ""; - } - if (oObj.damaged) { - due += - "" + - oObj.damaged.escapeHtml() + - ""; - } + if (oObj.lost && oObj.claims_returned) { + due += + "" + + oObj.lost.escapeHtml() + + ""; + } else if (oObj.lost) { + due += + "" + + oObj.lost.escapeHtml() + + ""; + } - var patron_note = - " "; - due += "
" + patron_note; + if (oObj.damaged) { + due += + "" + + oObj.damaged.escapeHtml() + + ""; + } - return due; + var patron_note = + " "; + due += "
" + patron_note; + + return due; + }, + sort: function (row, type, set, meta) { + return row.date_due; + }, }, }, { -- 2.34.1