From e31d15e381dd53cd5d64f41ee839dd3703d81489 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 28 Jan 2025 10:56:41 +0100 Subject: [PATCH] Bug 38984: Replace nosort with NoSort We don't need nosort and NoSort, use NoSort everywhere --- .../prog/en/modules/recalls/recalls_to_pull.tt | 3 +-- .../prog/en/modules/recalls/recalls_waiting.tt | 5 ++--- koha-tmpl/intranet-tmpl/prog/js/recalls.js | 1 - .../opac-tmpl/bootstrap/en/modules/opac-recalls.tt | 3 +-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 13 ++++++------- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 +-- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt index e2c576b4a9d..f4249d55edc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt @@ -54,7 +54,7 @@ Available item types Available locations Earliest recall date -   +   @@ -153,7 +153,6 @@ $(document).ready(function () { $("#recalls-table").kohaTable({ columnDefs: [ - { orderable: false, targets: ["nosort"] }, { type: "title-string", targets: ["title-string"] }, { type: "anti-the", targets: ["anti-the"] }, ], diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt index 08a392eeec0..79f45415ef1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt @@ -51,7 +51,7 @@ Title Requested by Pickup location -   +   @@ -104,7 +104,7 @@ Title Requested by Pickup location -   +   @@ -158,7 +158,6 @@ $(document).ready(function () { $("#recallswaiting-table, #recallsover-table").kohaTable({ autoWidth: false, - columnDefs: [{ orderable: false, targets: ["nosort"] }], pagingType: "full_numbers", }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/recalls.js b/koha-tmpl/intranet-tmpl/prog/js/recalls.js index 0833d181f3c..826c2745003 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/recalls.js +++ b/koha-tmpl/intranet-tmpl/prog/js/recalls.js @@ -129,7 +129,6 @@ $(document).ready(function () { $("#recalls-table").kohaTable({ columnDefs: [ - { orderable: false, targets: ["nosort"] }, { type: "title-string", targets: ["title-string"] }, { type: "anti-the", targets: ["anti-the"] }, ], diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt index 8d77a81bbb7..b6203aa2aac 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt @@ -39,7 +39,7 @@ Pickup location Status Due date - Modify + Modify @@ -140,7 +140,6 @@ details: { type: "column", target: -1 }, }, columnDefs: [ - { targets: ["nosort"], orderable: false, searchable: false }, { type: "anti-the", targets: ["anti-the"] }, { className: "dtr-control", orderable: false, targets: -1 }, ], diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index a519beb249c..5b9558d8f32 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -337,7 +337,7 @@ [% issues_count | html %] Item(s) checked out - [% IF ( JacketImages ) %] [% END %] + [% IF ( JacketImages ) %] [% END %] Title Author Due @@ -355,11 +355,11 @@ Fines [% END %] [% IF Koha.Preference('OPACMySummaryHTML') %] - Links + Links [% END %] [% IF ( Koha.Preference('AllowCheckoutNotes') ) %] Checkout note - Report a problem + Report a problem [% END %] @@ -728,14 +728,14 @@ - [% IF ( JacketImages ) %] [% END %] + [% IF ( JacketImages ) %] [% END %] Title [% UNLESS ( item_level_itypes ) %]Item type[% END %] [% IF ( show_barcode ) %]Barcode[% END %] Call number Due [% IF ( OpacRenewalAllowed ) %] - Renew + Renew [% END %] [% IF ( OPACFinesTab ) %] Fines @@ -862,7 +862,7 @@ Expires on Pickup location Status -   +   @@ -1208,7 +1208,6 @@ "sorting" : [[ thIndex, 'asc' ]], "dom": '<"top"<"table_entries"><"table_controls"fB>>t', "columnDefs": [ - { "targets": [ "nosort" ],"orderable": false,"searchable": false }, { "type": "anti-the", "targets" : [ "anti-the" ] }, { "visible": false, "targets" : [ "hidden" ] }, { "className": 'dtr-control', "orderable": false, "targets": -1 } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 15f863e1228..f4e91661e50 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -179,7 +179,7 @@ Title Call number Due - Renew + Renew [% UNLESS ( nofines ) %] Fines [% END %] @@ -461,7 +461,6 @@ sorting: [[thIndex, "asc"]], dom: '<"top"<"table_entries"><"table_controls"f>>t<"clear">', columnDefs: [ - { targets: ["nosort"], orderable: false, searchable: false }, { targets: ["noshow"], visible: false, searchable: false }, { type: "anti-the", targets: ["anti-the"] }, { visible: false, targets: ["hidden"] }, -- 2.34.1