From 722ce8a403e8395c8919c90b62bd33afbe0cdbdd Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 17 Aug 2023 17:25:56 +0000
Subject: [PATCH] Bug 34356: Make sort order always default to correct column

To test:
1- Check out an item to a patron
2- View checkout history, default sort is on 'Date due'
3- Enable RecordStaffUserOnCheckout
4- View checkout history, default sort is on 'Checked out by'
5- Apply patch
6- Table should sort to 'Date due' no matter what the sys pref is set to

Signed-off-by: Jason <jrobb@sekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit edad82662cf00e60bf228cd838ae86bdc1f36143)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 80cc0c03aa4b561b7c80d0331c6392b1450dd11e)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/modules/members/readingrec.tt    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index ec4c5dfdb9..f93fae1117 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -174,10 +174,15 @@
     [% Asset.js("js/checkout_renewals_modal.js") | $raw %]
     <script id="js">
         $(document).ready(function() {
+            [% IF Koha.Preference('RecordStaffUserOnCheckout') %]
+                var column_sort = 11;
+            [% ELSE %]
+                var column_sort = 10;
+            [% END %]
             var table_settings = [% TablesSettings.GetTableSettings('members', 'checkouthistory', 'checkouthistory-table', 'json') | $raw %];
             var table = KohaTable("table_readingrec", {
                 "sPaginationType": "full",
-                "aaSorting": [[10, 'desc']]
+                "aaSorting": [[column_sort, 'desc']]
             }, table_settings);
 
             $("#tabs a[data-toggle='tab']").on("shown.bs.tab", function (e) {
-- 
2.39.5