From 2b2e63db46598fa896dafdf67169683b0b75b865 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 28 Jan 2025 11:32:21 +0100 Subject: [PATCH] Bug 38984: Add NoSort when can replace targets In those occurrences we can simply use NoSort. It fixes some bugs, where the display of the column depends on some pref's values --- .../prog/en/includes/clubs-table.inc | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 5 ++--- .../prog/en/modules/acqui/booksellers.tt | 3 +-- .../prog/en/modules/acqui/invoices.tt | 9 +++------ .../en/modules/acqui/newordersuggestion.tt | 3 +-- .../prog/en/modules/acqui/parcel.tt | 5 ++--- .../prog/en/modules/acqui/z3950_search.tt | 9 +++------ .../prog/en/modules/admin/aqbudgetperiods.tt | 5 ++--- .../en/modules/admin/auth_tag_structure.tt | 3 +-- .../en/modules/admin/branch_transfer_limits.tt | 3 +-- .../prog/en/modules/admin/cash_registers.tt | 5 ++--- .../prog/en/modules/admin/koha2marclinks.tt | 3 +-- .../prog/en/modules/admin/marctagstructure.tt | 3 +-- .../prog/en/modules/admin/overdrive.tt | 3 +-- .../prog/en/modules/admin/systempreferences.tt | 7 +++---- .../prog/en/modules/admin/z3950servers.tt | 3 +-- .../en/modules/catalogue/search-history.tt | 9 ++++----- .../modules/cataloguing/z3950_auth_search.tt | 3 +-- .../prog/en/modules/circ/article-requests.tt | 18 ++++++------------ .../prog/en/modules/circ/transfers_to_send.tt | 5 +---- .../prog/en/modules/circ/transferstoreceive.tt | 5 +---- .../prog/en/modules/clubs/clubs.tt | 4 +--- .../prog/en/modules/labels/label-manage.tt | 3 +-- .../prog/en/modules/members/discharges.tt | 3 +-- .../prog/en/modules/members/update-child.tt | 3 +-- .../prog/en/modules/patroncards/edit-batch.tt | 5 ++--- .../prog/en/modules/serials/claims.tt | 3 +-- .../en/modules/serials/serials-collection.tt | 5 ++--- .../serials/subscription-numberpatterns.tt | 3 +-- .../intranet-tmpl/prog/en/modules/tags/list.tt | 5 ++--- .../en/modules/tools/batch_delete_records.tt | 6 ++---- .../modules/tools/batch_record_modification.tt | 10 ++++------ .../bootstrap/en/modules/opac-basket.tt | 5 ++--- .../bootstrap/en/modules/opac-idref.tt | 5 ++--- .../bootstrap/en/modules/opac-illrequests.tt | 3 +-- .../bootstrap/en/modules/opac-readingrecord.tt | 1 - .../en/modules/opac-search-history.tt | 7 ++----- .../bootstrap/en/modules/opac-tags.tt | 3 +-- 38 files changed, 65 insertions(+), 120 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc index 4dfef37c034..f2f5ee96d76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -16,7 +16,7 @@ End date Enrolled patrons [% UNLESS destination == 'holds' %] -   +   [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 625ab4568d7..6dfb2c46c66 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -271,7 +271,7 @@ Billing place Delivery place Number of baskets - Action + Action @@ -323,7 +323,7 @@ Billing place Delivery place Number of baskets - Action + Action @@ -424,7 +424,6 @@ [% END %] [% UNLESS ( grouping ) %] let dt_params = { - columnDefs: [{ targets: [-1], orderable: false, searchable: false }], autoWidth: false, pagingType: "full", }; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index a1ac247f2b1..a0beef55f3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -135,7 +135,7 @@ Basket group Internal note Closed - Actions + Actions @@ -269,7 +269,6 @@ searching: false, info: false, order: [[1, "asc"]], - columnDefs: [{ targets: [-1], orderable: false }], }); $("#supplierlist").change(function () { var id = $(this).find("option:selected").val(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index fb00c76613d..7edeafab946 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -59,7 +59,7 @@ [% IF CAN_user_acquisition_merge_invoices %]   [% END %] -   +   Invoice number Vendor Shipment date @@ -67,7 +67,7 @@ Received bibliographic records Received items Status -   +   @@ -500,10 +500,7 @@ var resultst = $("table.result").kohaTable({ paging: false, - columnDefs: [ - { orderable: false, targets: [1, -1] }, - { visible: false, targets: [0] }, - ], + columnDefs: [{ visible: false, targets: [0] }], autoWidth: false, }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index e3e1c09e742..13953071b08 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -57,7 +57,7 @@ Price Quantity Total -   +   @@ -121,7 +121,6 @@ var suggestionst = $("#suggestionst").kohaTable({ columnDefs: [ { targets: [0], visible: false, searchable: true }, // must be searchable for filtering - { targets: [-1], orderable: false, searchable: false }, ], pagingType: "full", }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 890fd646692..306ffc72160 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -153,14 +153,14 @@ Order line Holds Summary - More + More Replacement price Quantity Fund Est cost Actual cost TOTAL - + @@ -376,7 +376,6 @@ [5, 10, 20, 50, 100, -1], [5, 10, 20, 50, 100, _("All")], ], - columnDefs: [{ targets: [5, -1], orderable: false, searchable: false }], columns: [ { type: "html" }, { type: "html" }, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 0dd4640557b..c5089124618 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -190,9 +190,9 @@ ISBN LCCN [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %] - Additional fields + Additional fields [% END %] - Actions + Actions $(document).ready(function () { var resultst = $("#resultst").kohaTable({ - columnDefs: [ - { targets: [-1, -2], orderable: false, searchable: false }, - { targets: [1], type: "nsb-nse" }, - ], + columnDefs: [{ targets: [1], type: "nsb-nse" }], order: [[1, "asc"]], paginate: false, searching: false, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 5d4b6e30f49..3c63a84ae78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -484,7 +484,7 @@ End date Locked Total - Actions + Actions @@ -524,7 +524,7 @@ End date Locked Total - Actions + Actions @@ -568,7 +568,6 @@ [% END %] let dt_params = { - columnDefs: [{ targets: [-1], orderable: false, searchable: false }], pagingType: "full", autoWidth: false, }; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 0c7ca26927d..2f0823b716c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -248,7 +248,7 @@ Repeatable Mandatory Authorized
value -   +   @@ -290,7 +290,6 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt index e8b7dc38801..8ba20f77532 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt @@ -41,7 +41,7 @@ Patron Library Date requested - Allow + Allow @@ -77,7 +77,6 @@ info: true, searching: true, order: [[2, "asc"]], - columnDefs: [{ targets: -1, orderable: false }], }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt index a3a5d9fcac2..dee63a66738 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt @@ -24,7 +24,7 @@ - + @@ -68,7 +68,6 @@ $("#catst").kohaTable({ dom: "t", order: [[2, "asc"]], - columnDefs: [{ targets: [0], orderable: false, searchable: false }], paginate: false, }); $("#updatechildf").validate({ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index bf30dfc3568..04ea6847463 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -114,9 +114,9 @@ [% CASE "Borrower Number" %] [% CASE "Actions " %] - + [% CASE "Select" -%] - + [% CASE %] [% END -%] @@ -309,7 +309,6 @@ $("#description").hide(); [% END %] $("#batcht").kohaTable({ - columnDefs: [{ targets: [-2, -1], orderable: false, searchable: false }], order: [[0, "asc"]], pagingType: "full", lengthMenu: [aLengthMenu, aLengthMenuLabel], diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index ee19527ff4d..50cf42bfe81 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -117,7 +117,7 @@
   Code Description
Borrower numberActionsActionsSelectSelect[% header_field.field_label | html %]
- + @@ -219,7 +219,6 @@ $(document).ready(function () { sTable = $("#claimst").kohaTable({ dom: "t", - columnDefs: [{ targets: [0], orderable: false, searchable: false }], paginate: false, }); $("#supplierid").change(function () { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 67c39806aae..03ffa1c3a8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -221,7 +221,7 @@ [% IF ( CAN_user_serials_receive_serials ) %] - + [% END %] [% IF ( subscriptions.size > 1 ) %] @@ -234,7 +234,7 @@ [% IF ( routing ) %] - + [% END %] @@ -360,7 +360,6 @@ $("#subscription_years a:first").tab("show"); } $(".subscription-year-table").kohaTable({ - columnDefs: [{ targets: [0, -1], orderable: false, searchable: false }], order: [[0, "desc"]], dom: "t", autoWidth: false, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt index 64217e7a9a1..aec67a6976d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt @@ -295,7 +295,7 @@ - + @@ -391,7 +391,6 @@ $(document).ready(function(){ $("#numberpatternst").kohaTable({ - columnDefs: [{ targets: [-1], orderable: false, searchable: false }], pagingType: "full", }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt index 33c4676fab3..8fceb662d6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt @@ -56,8 +56,8 @@ - - + + @@ -160,7 +160,6 @@ } }); $("#itemst").kohaTable({ - columnDefs: [{ targets: [-1, -2], orderable: false, searchable: false }], order: [[0, "asc"]], pagingType: "full", }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt index c325868b00d..40a8056fa99 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt @@ -173,7 +173,7 @@
Vendor Library Title
EditEdit# SubsNotes LibraryRoutingRouting
Description Numbering formula Display orderActionsActions
TitleLocation Location 
- + @@ -217,7 +217,7 @@
Biblionumber Title Items
- + @@ -348,7 +348,6 @@ $("#biblios").kohaTable({ columnDefs: [ - { targets: [0], orderable: false, searchable: false }, { targets: [3, 4], type: "num-html" }, ], dom: "t", @@ -358,7 +357,6 @@ $("#authorities").kohaTable({ columnDefs: [ - { targets: [0], orderable: false, searchable: false }, { targets: [3], type: "num-html" }, ], dom: "t", diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt index d61e04840aa..00019c2f736 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -210,10 +210,10 @@
AuthID Summary Used in
- + - + @@ -249,10 +249,10 @@
   Biblionumber Title  
- + - + @@ -355,7 +355,6 @@ $("#biblios").kohaTable({ columnDefs: [ - { targets: [0, 3], orderable: false, searchable: false }, { targets: [1], type: "num-html" }, ], dom: "t", @@ -365,7 +364,6 @@ $("#authorities").kohaTable({ columnDefs: [ - { targets: [0, 3], orderable: false, searchable: false }, { targets: [1], type: "num-html" }, ], dom: "t", diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt index 6df5401b71f..0a2180a8f10 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -314,11 +314,11 @@ - + - + @@ -546,7 +546,6 @@ if( $("#itemst").length > 0 ){ var itemst = $("#itemst").kohaTable({ order: [[1, "asc"]], - columnDefs: [{ targets: [0, -1], orderable: false, searchable: false }], }); var buttons = new $.fn.dataTable.Buttons(itemst, { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt index 44d1abac7ad..5a4a58c5e5e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt @@ -29,8 +29,8 @@ - - + + @@ -54,7 +54,6 @@ $(document).ready(function () { $("table").kohaTable({ filter: false, - columnDefs: [{ targets: [-1, -2], orderable: false }], }); $(".role").click(function () { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index b3a5bfad6c1..4b3125779e0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -142,7 +142,7 @@ - + @@ -335,7 +335,6 @@ [% INCLUDE 'datatables.inc' %]
  AuthID Summary  
Items in your cart
   Title Author YearLocation (Status)Location (Status)
CitationKohaSudocKohaSudoc
Status Request placed Last updated