From f50378deb68bf919e080c8b2f70022b14feb3947 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 Signed-off-by: Owen Leonard --- .../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 541b1e8635..cd39fbe847 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 @@ -62,7 +62,7 @@ Available item types Available locations Earliest recall date -   +   @@ -167,7 +167,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 d42a4b7a4e..8b5bfa3c9f 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 @@ -56,7 +56,7 @@ Title Requested by Pickup location -   +   [% FOREACH recall IN recalls %] @@ -105,7 +105,7 @@ Title Requested by Pickup location -   +   [% FOREACH recall IN over %] @@ -168,7 +168,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 56a69cfea4..0ce59fe02d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/recalls.js +++ b/koha-tmpl/intranet-tmpl/prog/js/recalls.js @@ -104,7 +104,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 2c79687ba2..a181bb9fb7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt @@ -40,7 +40,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 e4234fffd8..1f4270b12c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -333,7 +333,7 @@ [% issues_count | html %] Item(s) checked out - [% IF ( JacketImages ) %] [% END %] + [% IF ( JacketImages ) %] [% END %] Title Author Due @@ -351,11 +351,11 @@ Fines [% END %] [% IF Koha.Preference('OPACMySummaryHTML') %] - Links + Links [% END %] [% IF ( Koha.Preference('AllowCheckoutNotes') ) %] Checkout note - Report a problem + Report a problem [% END %] @@ -715,14 +715,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 @@ -846,7 +846,7 @@ Expires on Pickup location Status -   +   @@ -1209,7 +1209,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 c068e08f63..f343a1f1dd 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 @@ -361,7 +361,7 @@ Title Call number Due - Renew + Renew [% UNLESS ( nofines ) %] Fines [% END %] @@ -603,7 +603,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.39.5