Bugzilla – Attachment 181024 Details for
Bug 38984
DataTables's columnDefs cleanup
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38984: Add NoSort when can replace targets
Bug-38984-Add-NoSort-when-can-replace-targets.patch (text/plain), 48.32 KB, created by
Owen Leonard
on 2025-04-16 16:03:45 UTC
(
hide
)
Description:
Bug 38984: Add NoSort when can replace targets
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-04-16 16:03:45 UTC
Size:
48.32 KB
patch
obsolete
>From 2f2afd983600b8ca628f291a7ad5bb6430dd95ae Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk> >--- > .../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 ++--- > .../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 +-- > 37 files changed, 64 insertions(+), 118 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 @@ > <th>End date</th> > <th>Enrolled patrons</th> > [% UNLESS destination == 'holds' %] >- <th> </th> >+ <th class="NoSort"> </th> > [% END %] > </tr> > </thead> >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 8918500e816..01d0911d3fc 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 @@ > <th>Billing place</th> > <th>Delivery place</th> > <th>Number of baskets</th> >- <th>Action</th> >+ <th class="NoSort">Action</th> > </tr> > </thead> > <tbody> >@@ -323,7 +323,7 @@ > <th>Billing place</th> > <th>Delivery place</th> > <th>Number of baskets</th> >- <th>Action</th> >+ <th class="NoSort">Action</th> > </tr> > </thead> > <tbody> >@@ -426,7 +426,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 79513dbd5e9..99fa2e5f692 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 @@ > <th>Basket group</th> > <th>Internal note</th> > <th>Closed</th> >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > </tr> > </thead> > <tbody> >@@ -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 %] > <th> </th> > [% END %] >- <th> </th> >+ <th class="NoSort"> </th> > <th>Invoice number</th> > <th>Vendor</th> > <th>Shipment date</th> >@@ -67,7 +67,7 @@ > <th>Received bibliographic records</th> > <th>Received items</th> > <th>Status</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr> > </thead> > <tbody> >@@ -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 @@ > <th>Price</th> > <th>Quantity</th> > <th>Total</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr> > </thead> > <tbody> >@@ -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 @@ > <th>Order line</th> > <th title="Item holds / Total holds">Holds</th> > <th>Summary</th> >- <th>More</th> >+ <th class="NoSort">More</th> > <th>Replacement price</th> > <th>Quantity</th> > <th>Fund</th> > <th>Est cost</th> > <th>Actual cost</th> > <th>TOTAL</th> >- <th></th> >+ <th class="NoSort"></th> > </tr> > </thead> > <tfoot> >@@ -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 @@ > <th>ISBN</th> > <th>LCCN</th> > [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %] >- <th>Additional fields</th> >+ <th class="NoSort">Additional fields</th> > [% END %] >- <th>Actions</th> >+ <th class="NoSort">Actions</th> > </tr></thead > > > <tbody >@@ -334,10 +334,7 @@ > <script> > $(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 @@ > <th>End date</th> > <th>Locked</th> > <th>Total</th> >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > </tr> > </thead> > <tbody> >@@ -524,7 +524,7 @@ > <th>End date</th> > <th>Locked</th> > <th>Total</th> >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > </tr> > </thead> > <tbody> >@@ -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 @@ > <th>Repeatable</th> > <th>Mandatory</th> > <th>Authorized<br />value</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr> > </thead> > <tbody> >@@ -290,7 +290,6 @@ > <script> > $(document).ready(function () { > $("#table_authtagstructure").kohaTable({ >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > pagingType: "full", > }); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index a81080c0e6e..f650f27520a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -83,7 +83,7 @@ > <thead> > <tr> > <th>Library</th> >- <th>Allow transfer?</th> >+ <th class="NoSort">Allow transfer?</th> > </tr> > </thead> > >@@ -180,7 +180,6 @@ > > [% FOREACH codes_loo IN codes_loop %] > $("#[% codes_loo.code | html %]table").kohaTable({ >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > paginate: false, > }); > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >index d071a020745..841dfd094db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt >@@ -171,8 +171,8 @@ > <th>Description</th> > <th>Library</th> > <th>Library default</th> >- <th>Initial float</th> >- <th class="noExport">Actions</th> >+ <th class="NoSort">Initial float</th> >+ <th class="noExport NoSort">Actions</th> > </thead> > <tbody> > [% FOREACH cash_register IN cash_registers %] >@@ -237,7 +237,6 @@ > <script> > $(document).ready(function () { > var crtable = $("#table_cash_registers").kohaTable({ >- columnDefs: [{ targets: [-1, -2], orderable: false, searchable: false }], > order: [[1, "asc"]], > paginationType: "full", > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >index 2b8a8749c1c..bdfab6b3e98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >@@ -48,7 +48,7 @@ > <th>Tag</th> > <th>Subfield</th> > <th>Lib</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr></thead > > > <tbody> >@@ -109,7 +109,6 @@ > } > $(document).ready(function () { > $("#kohafields").kohaTable({ >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > paging: false, > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index 1f744523223..a9c6e1ae6d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -257,7 +257,7 @@ > <th>Auth value</th> > <th>Indicator 1</th> > <th>Indicator 2</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr> > </thead> > <tbody> >@@ -326,7 +326,6 @@ > <script> > $(document).ready(function () { > $("#table_marctagstructure").kohaTable({ >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > pagingType: "full", > }); > $("#select_display").on("change", function () { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >index 85996f704ea..0db73ec98c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >@@ -43,7 +43,7 @@ > <thead> > <tr> > <th>Library</th> >- <th>Authname</th> >+ <th class="NoSort">Authname</th> > </tr> > </thead> > <tbody> >@@ -73,7 +73,6 @@ > <script> > $(document).ready(function () { > $("#od_info").kohaTable({ >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > pagingType: "full", > }); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index 7064999c523..0d16571cda5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -334,9 +334,9 @@ > <thead > ><tr> > <th>Preference</th> >- <th>Explanation</th> >- <th>Value</th> >- <th class="noExport">Actions</th> >+ <th class="NoSort">Explanation</th> >+ <th class="NoSort">Value</th> >+ <th class="noExport NoSort">Actions</th> > </tr></thead > > > <tbody >@@ -498,7 +498,6 @@ > [% IF ( loop ) %] > $("#sysprefst").kohaTable({ > dom: '<"top pager"ilf>t', >- columnDefs: [{ targets: [-1, -2, -3], orderable: false }], > paginate: false, > }); > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index d354bd7d140..b5fa6d6e85a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -220,7 +220,7 @@ > <thead > ><tr > ><th>Target</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Preselected</th><th>Rank</th><th>Syntax</th><th>Encoding</th><th>Timeout</th><th>Record type</th><th>Attributes</th >- ><th class="noExport">Actions</th> >+ ><th class="noExport NoSort">Actions</th> > </tr></thead > > > <tbody> >@@ -319,7 +319,6 @@ > [% ELSE %] > $(document).ready(function() { > $("#serverst").kohaTable({ >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > pagingType: "full", > }); > $(".delete").on("click",function(e){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 71b58cb314e..365e9372a42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -60,7 +60,7 @@ > <table class="historyt"> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"></th> > <th>Date</th> > <th>Search</th> > <th>Results</th> >@@ -102,7 +102,7 @@ > <table class="historyt"> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"></th> > <th>Date</th> > <th>Search</th> > <th>Results</th> >@@ -146,7 +146,7 @@ > <table class="historyt"> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"></th> > <th>Date</th> > <th>Search</th> > <th>Results</th> >@@ -188,7 +188,7 @@ > <table class="historyt"> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"></th> > <th>Date</th> > <th>Search</th> > <th>Results</th> >@@ -224,7 +224,6 @@ > // (so that the more recent query is shown first) > $(".historyt").kohaTable({ > order: [[1, "desc"]], >- columnDefs: [{ targets: [0], orderable: false, searchable: false }], > pagingType: "full_numbers", > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index 7995ae68383..ef97198bfd8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -100,7 +100,7 @@ > [% IF Koha.Preference('AdditionalFieldsInZ3950ResultAuthSearch') %] > <th>Additional fields</th> > [% END %] >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > </tr></thead > > > <tbody >@@ -267,7 +267,6 @@ > $(document).ready(function () { > $("#resultst").kohaTable({ > dom: "t", >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > order: [[1, "asc"]], > paginate: false, > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index 63ad4ee8d67..1be249ac622 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -221,7 +221,7 @@ > <th class="ar-urls">URLs</th> > <th class="ar-patron">Patron</th> > <th class="ar-date">Date</th> >- <th class="ar-actions noExport">Actions</th> >+ <th class="ar-actions noExport NoSort">Actions</th> > </tr> > </thead> > >@@ -328,7 +328,7 @@ > <th class="ar-urls">URLs</th> > <th class="ar-patron">Patron</th> > <th class="ar-date">Date</th> >- <th class="ar-actions noExport">Actions</th> >+ <th class="ar-actions noExport NoSort">Actions</th> > </tr> > </thead> > >@@ -434,7 +434,7 @@ > <th class="ar-urls">URLs</th> > <th class="ar-patron">Patron</th> > <th class="ar-date">Date</th> >- <th class="ar-actions noExport">Actions</th> >+ <th class="ar-actions noExport NoSort">Actions</th> > </tr> > </thead> > >@@ -574,15 +574,9 @@ > if( link.length > 0 ) link[0].focus(); > }); > >- requested_datatable = $("#article-requests-requested-table").kohaTable({ >- columnDefs: [{ targets: [0, -1], orderable: false, searchable: false }], >- }); >- pending_datatable = $("#article-requests-pending-table").kohaTable({ >- columnDefs: [{ targets: [0, -1], orderable: false, searchable: false }], >- }); >- processing_datatable = $("#article-requests-processing-table").kohaTable({ >- columnDefs: [{ targets: [0, -1], orderable: false, searchable: false }], >- }); >+ requested_datatable = $("#article-requests-requested-table").kohaTable(); >+ pending_datatable = $("#article-requests-pending-table").kohaTable(); >+ processing_datatable = $("#article-requests-processing-table").kohaTable(); > active_datatable = requested_datatable; > activateBatchActions( active_tab ); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >index a94698fda10..7b15753f444 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt >@@ -53,7 +53,7 @@ > <th>On loan</th> > <th>Home library</th> > <th>Call number</th> >- <th>Actions</th> >+ <th class="NoSort">Actions</th> > </tr> > </thead> > <tbody> >@@ -100,9 +100,6 @@ > $(document).ready(function() { > [% FOREACH library IN libraries %] > $("#transferst[% library.branchcode | html %]").kohaTable({ >- columnDefs: [ >- { targets: [-1], orderable: false, searchable: false }, >- ], > dom: "t", > paginate: false, > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index f97222062d5..2c0532aed00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -50,7 +50,7 @@ > <th>On hold for</th> > <th>Home library</th> > <th>Call number</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr></thead > > > <tbody >@@ -115,9 +115,6 @@ > $(document).ready(function() { > [% FOREACH branchesloo IN branchesloop %] > $("#transferst[% branchesloo.branchcode | html %]").kohaTable({ >- columnDefs: [ >- { targets: [-1], orderable: false, searchable: false }, >- ], > dom: "t", > paginate: false, > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index 809c6bcf286..712f9c9560b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -73,7 +73,7 @@ > <th>Public enrollment</th> > <th>Email required</th> > <th>Library</th> >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > </tr> > </thead> > <tbody> >@@ -151,13 +151,11 @@ > tTable = $("#club-templates-table").kohaTable({ > pagingType: "full", > dom: 'C<"top pager"ilpf><"#filter_c">tr<"bottom pager"ip>', >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > }); > > cTable = $("#clubs-table").kohaTable({ > pagingType: "full", > dom: 'C<"top pager"ilpf><"#filter_c">tr<"bottom pager"ip>', >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > }); > > $("body").on("click", ".delete_club", function (e) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index f3d076aa096..bb25494d8f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -91,7 +91,7 @@ > [% CASE 'Description' %] > <th>Description</th> > [% CASE 'Actions' %] >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > [% CASE 'Profile ID' %] > <th>Profile ID</th> > [% CASE 'Printer Name' %] >@@ -219,7 +219,6 @@ > $("#labels-table").kohaTable({ > pagingType: "full", > order: [[1, "asc"]], >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > }); > }); > </script> >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 @@ > <th>Patron</th> > <th>Library</th> > <th>Date requested</th> >- <th>Allow</th> >+ <th class="NoSort">Allow</th> > </tr> > </thead> > <tbody> >@@ -77,7 +77,6 @@ > info: true, > searching: true, > order: [[2, "asc"]], >- columnDefs: [{ targets: -1, orderable: false }], > }); > }); > </script> >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 @@ > <table id="catst"> > <thead> > <tr> >- <th> </th> >+ <th class="NoSort"> </th> > <th>Code</th> > <th>Description</th> > </tr> >@@ -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 48b89af14f2..843f0766910 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" %] > <th>Borrower number</th> > [% CASE "Actions " %] >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > [% CASE "Select" -%] >- <th>Select</th> >+ <th class="NoSort">Select</th> > [% CASE %] > <th>[% header_field.field_label | html %]</th> > [% END -%] >@@ -310,7 +310,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/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 @@ > <thead> > <tr> > [% IF ( CAN_user_serials_receive_serials ) %] >- <th>Edit</th> >+ <th class="NoSort">Edit</th> > [% END %] > [% IF ( subscriptions.size > 1 ) %] > <th># Subs</th> >@@ -234,7 +234,7 @@ > <th>Notes</th> > <th>Library</th> > [% IF ( routing ) %] >- <th>Routing</th> >+ <th class="NoSort">Routing</th> > [% END %] > </tr> > </thead> >@@ -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 @@ > <th>Description</th> > <th>Numbering formula</th> > <th>Display order</th> >- <th class="noExport">Actions</th> >+ <th class="noExport NoSort">Actions</th> > </tr> > </thead> > <tbody> >@@ -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 711c86f316f..5377ef822e1 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 @@ > <thead > ><tr> > <th>Title</th> >- <th>Location</th> >- <th> </th> >+ <th class="NoSort">Location</th> >+ <th class="NoSort"> </th> > </tr></thead > > > >@@ -162,7 +162,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 @@ > <table id="biblios" class="records"> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"></th> > <th>Biblionumber</th> > <th>Title</th> > <th>Items</th> >@@ -217,7 +217,7 @@ > <table id="authorities" class="records"> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"></th> > <th>AuthID</th> > <th>Summary</th> > <th>Used in</th> >@@ -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 @@ > <table id="biblios" class="records"> > <thead> > <tr> >- <th> </th> >+ <th class="NoSort"> </th> > <th>Biblionumber</th> > <th>Title</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr> > </thead> > <tbody> >@@ -249,10 +249,10 @@ > <table id="authorities" class="records"> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"> </th> > <th>AuthID</th> > <th>Summary</th> >- <th> </th> >+ <th class="NoSort"> </th> > </tr> > </thead> > <tbody> >@@ -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 7ecfc3901f5..a7ea8bcdea1 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 @@ > <caption class="sr-only">Items in your cart</caption> > <thead> > <tr> >- <th class="noprint"> </th> >+ <th class="noprint NoSort"> </th> > <th>Title</th> > <th>Author</th> > <th>Year</th> >- <th>Location (Status)</th> >+ <th class="NoSort">Location (Status)</th> > </tr> > </thead> > <tbody> >@@ -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 @@ > <thead> > <tr> > <th>Citation</th> >- <th>Koha</th> >- <th>Sudoc</th> >+ <th class="NoSort">Koha</th> >+ <th class="NoSort">Sudoc</th> > </tr> > </thead> > <tbody> >@@ -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 8fb64a571b8..69971dbe14d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >@@ -148,7 +148,7 @@ > <th>Status</th> > <th>Request placed</th> > <th>Last updated</th> >- <th></th> >+ <th class="NoSort"></th> > </tr> > </thead> > <tbody> >@@ -370,7 +370,6 @@ > [% INCLUDE 'datatables.inc' %] > <script> > $("#illrequestlist").kohaTable({ >- columnDefs: [{ targets: [-1], orderable: false, searchable: false }], > order: [[3, "desc"]], > }); > $("#backend-dropdown-options").removeClass("nojs"); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index a831e0cecac..1bda60ace53 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -241,7 +241,6 @@ > columnDefs: [ > { className: "dtr-control", orderable: false, targets: [-1] }, > { visible: false, targets: [0] }, >- { orderable: false, targets: [1] }, > ], > }, > ); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index 068703ae32a..c89b59e7459 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -91,7 +91,7 @@ > <caption class="sr-only">Current session</caption> > <thead> > <tr> >- <th></th> >+ <th class="NoSort"></th> > <th>Date</th> > <th>Search</th> > <th>Results</th> >@@ -297,10 +297,7 @@ > let history_tables = $(".historyt").kohaTable({ > order: [[1, "desc"]], > dom: '<"top"<"table_entries"><"table_controls"fB>>t', >- columnDefs: [ >- { targets: [0], orderable: false, searchable: false }, >- { className: "dtr-control", orderable: false, targets: -1 }, >- ], >+ columnDefs: [{ className: "dtr-control", orderable: false, targets: -1 }], > language: { > search: "_INPUT_", > searchPlaceholder: _("Search"), >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >index ee380139ab4..8fb52a9827e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -164,7 +164,7 @@ > <caption>Your tags</caption> > <thead> > <tr> >- <th> </th> >+ <th class="NoSort"> </th> > <th>Term</th> > <th class="all anti-the">Title</th> > <th>Date added</th> >@@ -298,7 +298,6 @@ > $("#mytagst").kohaTable({ > sorting: [[2, "asc"]], > columnDefs: [ >- { targets: [0], orderable: false, searchable: false }, > { className: "dtr-control", orderable: false, targets: -1 }, > { responsivePriority: 1, targets: 2 }, > ], >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38984
:
177253
|
177254
|
177255
|
177256
|
177257
|
177258
|
177259
|
177278
|
177279
|
177280
|
177281
|
177597
|
177598
|
177641
|
177642
|
177643
|
177644
|
177645
|
177646
|
177647
|
177648
|
177649
|
177651
|
177933
|
177934
|
177935
|
177936
|
177937
|
177938
|
177939
|
177940
|
177941
|
177942
|
179057
|
179058
|
179059
|
179060
|
179061
|
179062
|
179063
|
179064
|
179065
|
179066
|
180303
|
180356
|
180357
|
180358
|
180359
|
180360
|
180361
|
180362
|
180363
|
180364
|
180365
|
180366
|
181021
|
181022
|
181023
| 181024 |
181025
|
181026
|
181027
|
181028
|
181029
|
181030
|
181031