Bugzilla – Attachment 178508 Details for
Bug 26553
Remove KohaTable (columns_settings.inc) and use kohaTable (datatables.js)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26553: Replace KohaTable with kohaTable
Bug-26553-Replace-KohaTable-with-kohaTable.patch (text/plain), 68.87 KB, created by
Martin Renvoize (ashimema)
on 2025-02-21 16:14:09 UTC
(
hide
)
Description:
Bug 26553: Replace KohaTable with kohaTable
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2025-02-21 16:14:09 UTC
Size:
68.87 KB
patch
obsolete
>From 8309b05134a0b5044f4eb4afa28367b6cde3efa2 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 28 Nov 2024 16:57:21 +0100 >Subject: [PATCH] Bug 26553: Replace KohaTable with kohaTable > >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> > >JD Amended patch: replace wrong occurrences of "kohatable" with "kohaTable" > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/modules/acqui/acqui-home.tt | 3 +- > .../prog/en/modules/acqui/duplicate_orders.tt | 5 +-- > .../prog/en/modules/acqui/histsearch.tt | 10 +++-- > .../prog/en/modules/acqui/lateorders.tt | 3 +- > .../prog/en/modules/admin/aqbudgets.tt | 3 +- > .../en/modules/admin/authorised_values.tt | 3 +- > .../prog/en/modules/admin/currency.tt | 6 +-- > .../prog/en/modules/admin/desks.tt | 3 +- > .../prog/en/modules/admin/itemtypes.tt | 10 +++-- > .../en/modules/admin/patron-attr-types.tt | 4 +- > .../prog/en/modules/admin/smart-rules.tt | 3 +- > .../prog/en/modules/catalogue/detail.tt | 29 ++++++++------ > .../prog/en/modules/catalogue/issuehistory.tt | 14 ++++--- > .../prog/en/modules/catalogue/itemsearch.tt | 3 +- > .../prog/en/modules/cataloguing/addbooks.tt | 10 +++-- > .../en/modules/cataloguing/z3950_search.tt | 18 ++++----- > .../prog/en/modules/circ/overdue.tt | 12 +++--- > .../prog/en/modules/circ/pendingreserves.tt | 19 +++++---- > .../prog/en/modules/circ/reserveratios.tt | 23 ++++++----- > .../prog/en/modules/circ/returns.tt | 18 +++++---- > .../prog/en/modules/circ/view_holdsqueue.tt | 14 ++++--- > .../prog/en/modules/circ/waitingreserves.tt | 35 +++++++++------- > .../modules/course_reserves/course-details.tt | 12 +++--- > .../course_reserves/course-reserves.tt | 12 +++--- > .../prog/en/modules/members/boraccount.tt | 14 ++++--- > .../prog/en/modules/members/holdshistory.tt | 12 +++--- > .../prog/en/modules/members/housebound.tt | 3 +- > .../en/modules/members/moremember-print.tt | 40 +++++++++++-------- > .../prog/en/modules/members/pay.tt | 12 +++--- > .../prog/en/modules/members/readingrec.tt | 13 +++--- > .../prog/en/modules/patron_lists/list.tt | 10 +++-- > .../prog/en/modules/plugins/plugins-home.tt | 3 +- > .../intranet-tmpl/prog/en/modules/pos/pay.tt | 15 ++++--- > .../en/modules/reports/catalogue_stats.tt | 13 +++--- > .../modules/reports/guided_reports_start.tt | 19 ++++----- > .../prog/en/modules/reports/itemslost.tt | 22 +++++----- > .../en/modules/reports/orders_by_budget.tt | 10 +++-- > .../prog/en/modules/reserve/request.tt | 12 +++--- > .../en/modules/serials/subscription-detail.tt | 23 ++++++----- > .../prog/en/modules/suggestion/suggestion.tt | 14 ++++--- > .../prog/en/modules/tools/inventory.tt | 3 +- > .../prog/en/modules/tools/modborrowers.tt | 12 +++--- > .../prog/en/modules/tools/upload.tt | 4 +- > .../prog/js/cataloging_additem.js | 5 +-- > koha-tmpl/intranet-tmpl/prog/js/categories.js | 3 +- > koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 6 +-- > koha-tmpl/intranet-tmpl/prog/js/holds.js | 3 +- > .../intranet-tmpl/prog/js/ill-availability.js | 2 +- > .../intranet-tmpl/prog/js/ill-batch-modal.js | 2 +- > .../intranet-tmpl/prog/js/ill-batch-table.js | 3 +- > koha-tmpl/intranet-tmpl/prog/js/letter.js | 5 +-- > .../prog/js/marc_modification_templates.js | 4 +- > .../intranet-tmpl/prog/js/pages/batchMod.js | 4 +- > .../prog/js/pages/stockrotation.js | 8 ++-- > .../intranet-tmpl/prog/js/restrictiontypes.js | 2 +- > koha-tmpl/intranet-tmpl/prog/js/viewlog.js | 3 +- > 56 files changed, 314 insertions(+), 262 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index 76ac361d9b7..0f9857e9e48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -206,13 +206,12 @@ > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > dt_overwrite_html_sorting_localeCompare(); > > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'acq_acqui-home', 'accounts', 'json' ) | $raw %]; >- var oTable = KohaTable("accounts", { >+ var oTable = $("#accounts").kohaTable({ > "drawCallback": function ( oSettings ) { > if ( oSettings.aiDisplay.length == 0 ) > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >index 03181d0cfad..9ce4becaa52 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt >@@ -312,7 +312,6 @@ > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% Asset.js("js/acq.js") | $raw %] > [% Asset.js("js/funds_sorts.js") | $raw %] > <script> >@@ -329,8 +328,8 @@ > var MSG_NO_FUND_SELECTED = _("No fund selected."); > $(document).ready(function() { > $('span.hint').hide(); >- KohaTable("table_orders", { >- "paginate": false >+ $("#table_orders").kohaTable({ >+ paginate: false, > }); > > [% IF op == 'search' OR op == 'select' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 182682dae51..16ce86bbb0e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -167,14 +167,16 @@ > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > var MSG_REMOVE_PATRON = _("Remove"); > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'histsearch', 'histsearcht', 'json' ) | $raw %]; >- KohaTable("histsearcht", { >- "pagingType": "full" >- }, table_settings ); >+ $("#histsearcht").kohaTable( >+ { >+ pagingType: "full", >+ }, >+ table_settings >+ ); > > function AddPatron( patron_name, value, container, input_name ) { > div = "<div id='borrower_" + value + "'>" + patron_name + " ( <a href='#' class='removePatron'><i class='fa fa-trash-can' aria-hidden='true'></i> " + MSG_REMOVE_PATRON + " </a> ) <input type='hidden' name='" + input_name + "' value='" + value + "' /></div>"; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index e26799d9770..89c67ab476b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -373,7 +373,6 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'calendar.inc' %] > <script> > var late_orderst; >@@ -390,7 +389,7 @@ > $(document).ready(function() { > > var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'lateorders', 'late_orders', 'json' ) | $raw %]; >- late_orderst = KohaTable("late_orders", { >+ late_orderst = $("#late_orders").kohaTable({ > "sorting": [[ 1, "asc" ]], > "pagingType": "full", > "autoWidth": false, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index d5b552560ff..72b8aaaed78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -676,12 +676,11 @@ > [% PROCESS patron_search_js columns => columns, actions => ["select"], preview_on_name_click => 1, table_id => 'patron_search_modal_owner_table' %] > [% ELSIF op == 'list' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] > <script> > $(document).ready(function() { > [% IF budgets %] >- var oTable = KohaTable("budgeth", { >+ var oTable = $("#budgeth").kohaTable({ > "drawCallback": function ( oSettings ) { > if ( oSettings.aiDisplay.length == 0 ) > { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 98966b8f28d..519476a6f3d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -403,10 +403,9 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function () { >- KohaTable("categoriest", { >+ $("#categoriest").kohaTable({ > order: [[0, "asc"]], > pagingType: "full", > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 2660444016a..bedde3ac43c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -266,7 +266,6 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > function check_currency(val) { > if ( val == 1.0 ) { >@@ -280,9 +279,8 @@ > } > > $(document).ready(function() { >- columns_settings = [% TablesSettings.GetTableSettings( 'admin', 'currency', 'currencies-table', 'json' ) | $raw %] >- var issuest = KohaTable("currencies-table", { >- }, columns_settings ); >+ let table_settings = [% TablesSettings.GetTableSettings( 'admin', 'currency', 'currencies-table', 'json' ) | $raw %] >+ $("#currencies-table").kohaTable({}, table_settings); > > // prevents users to check active with a currency != 1 > $("#rate").keyup(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >index b8df5080e75..d0893fd6449 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -213,10 +213,9 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function () { >- KohaTable("table_desks", { >+ $("#table_desks").kohaTable({ > order: [[1, "asc"]], > }); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index a7af4530416..15550f97b2e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -535,7 +535,6 @@ > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings( 'admin', 'itemtypes', 'table_item_type', 'json' ) | $raw %]; >@@ -544,9 +543,12 @@ > [% END %] > > $(document).ready(function() { >- KohaTable("table_item_type", { >- "pagingType": "full" >- }, table_settings); >+ $("#table_item_type").kohaTable( >+ { >+ pagingType: "full", >+ }, >+ table_settings >+ ); > }); > > $( "#itemtypeentry" ).validate({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 7fe7422bcbf..7f4c2ec8b2a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -406,7 +406,6 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function () { > function toggle_search_default() { >@@ -460,8 +459,7 @@ > > $(".patron_attributes_types").each(function () { > var tableid = $(this).attr("id"); >- KohaTable( >- tableid, >+ $(tableid).kohaTable( > { > paginate: false, > autoWidth: false, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 7c36fb4d1d0..9ce8a43dbd2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -1426,11 +1426,10 @@ > [% Asset.js("js/admin-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'format_price.inc' %] > <script> > $(document).ready(function () { >- KohaTable("default-circulation-rules", { >+ $("#default-circulation-rules").kohaTable({ > columnDefs: [ > { visible: false, targets: [0, 2] }, > { orderable: false, targets: ["_all"] }, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index c901585fb02..19eb3aefb48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1700,7 +1700,6 @@ > </script> > [% END %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'js-date-format.inc' %] > [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %] > [% Asset.js("lib/dayjs/plugin/isSameOrBefore.js") | $raw %] >@@ -2072,12 +2071,15 @@ > > [% IF Koha.Preference('AcquisitionDetails') %] > var table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'acquisitiondetails-table', 'json') | $raw %]; >- var acquisitiondetails_table = KohaTable("orders", { >- "dom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >- "paginate": false, >- "autoWidth": false, >- "order": [[ 4, "desc" ]], >- }, table_settings); >+ var acquisitiondetails_table = $("#orders").kohaTable( >+ { >+ dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >+ paginate: false, >+ autoWidth: false, >+ order: [[4, "desc"]], >+ }, >+ table_settings >+ ); > [% END %] > > [% IF suggestions.count %] >@@ -2092,11 +2094,14 @@ > > [% IF ( reviews ) %] > var comment_table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'comments-table', 'json') | $raw %]; >- var comments_table = KohaTable("comments_table", { >- "paginate": false, >- "autoWidth": false, >- "order": [[ 2, "desc" ]], >- }, comment_table_settings); >+ var comments_table = $("#comments_table").kohaTable( >+ { >+ paginate: false, >+ autoWidth: false, >+ order: [[2, "desc"]], >+ }, >+ comment_table_settings >+ ); > [% END %] > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index ca95717b7d0..409f57721b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -127,7 +127,6 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script id="js"> > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'checkoutshistory-table', 'json') | $raw %]; >@@ -135,11 +134,14 @@ > // Remove the patron column definition > table_settings['columns'].splice(0,1); > [% END %] >- var table = KohaTable("table_issues", { >- "dom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >- "order": [[ 5, "desc" ]], >- "pagingType": "full_numbers" >- }, table_settings); >+ var table = $("#table_issues").kohaTable( >+ { >+ dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >+ order: [[5, "desc"]], >+ pagingType: "full_numbers", >+ }, >+ table_settings >+ ); > }); > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index c536d089ba1..cbfdfa733c4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -375,7 +375,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'select2.inc' %] > <script> > var authorised_values = [% authorised_values_json | $raw %]; >@@ -644,7 +643,7 @@ > }; > > var table_settings = [% TablesSettings.GetTableSettings( 'catalogue', 'itemsearch', 'results', 'json' ) | $raw %]; >- KohaTable('results' , { >+ $('#results').kohaTable( { > "bKohaColumnsUseNames": true, > "destroy": true, > "serverSide": true, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index a07d43361a8..98f0f77df93 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -284,7 +284,6 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function() { > //Set focus to cataloging search >@@ -329,9 +328,12 @@ > }); > > var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) | $raw %] >- var reservoirt = KohaTable("reservoir-table", { >- "pagingType": "simple" >- }, table_settings ); >+ var reservoirt = $("#reservoir-table").kohaTable( >+ { >+ pagingType: "simple", >+ }, >+ table_settings >+ ); > }); > > /* this function open a popup to search on z3950 server. */ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index 749ad8cb3ed..c81720479d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -272,21 +272,21 @@ > [% END %] > > [% MACRO jsinclude BLOCK %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'z3950_search.inc' %] > [% Asset.js("js/z3950_search.js") | $raw %] > <script> > $(document).ready(function(){ > var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'z3950_search', 'resultst', 'json' ) | $raw %]; >- var thetable = KohaTable("resultst", { >- "columnDefs": [ >- { "targets": [ 1 ], "type": "nsb-nse" }, >- ], >- "paginate": false, >- "searching": false, >- "info": false >- }, table_settings ); >+ var thetable = $("#resultst").kohaTable( >+ { >+ columnDefs: [{ targets: [1], type: "nsb-nse" }], >+ paginate: false, >+ searching: false, >+ info: false, >+ }, >+ table_settings >+ ); > InitLastAction(); > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index bb254a247de..c67eb0cf554 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -327,7 +327,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'select2.inc' %] > [% INCLUDE 'js-date-format.inc' %] > [% PROCESS 'modal-claims-js' %] >@@ -372,10 +371,13 @@ > table_settings['columns'].splice(13, 1); > [% END %] > >- KohaTable("overduest", { >- "pagingType": "full", >- "autoWidth": false, >- }, table_settings); >+ $("#overduest").kohaTable( >+ { >+ pagingType: "full", >+ autoWidth: false, >+ }, >+ table_settings >+ ); > > $("#showall").on("change", function(){ > update_date_due_filters_visibility(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index 500aaf06367..966888bec9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -292,7 +292,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > function get_options(column){ > let regex = /(<([^>]+)>)/ig; // Remove html tags >@@ -319,12 +318,18 @@ > > > var table_settings = [% TablesSettings.GetTableSettings('circ', 'holds', 'holds-to-pull', 'json') | $raw %]; >- var holdst = KohaTable("holdst", { >- "pagingType": "full_numbers", >- "columnDefs": [ >- { "orderable": false, "searchable": false, "targets": [ 'NoSort' ] }, >- ], >- }, table_settings, true, null, filters_options); >+ var holdst = $("#holdst").kohaTable( >+ { >+ pagingType: "full_numbers", >+ columnDefs: [ >+ { orderable: false, searchable: false, targets: ["NoSort"] }, >+ ], >+ }, >+ table_settings, >+ true, >+ null, >+ filters_options >+ ); > }); > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 6282468516d..a9f97bb9f2c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -214,19 +214,24 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > var table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holdsratios', 'holds-ratios', 'json' ) | $raw %]; > $(document).ready(function() { >- KohaTable("holds-ratios", { >- "order": [ [2,'desc'], [3,'asc'] ], >- "columnDefs": [ >- { "type": "anti-the", "targets": [ "anti-the" ] }, >- { "type": "natural", "targets": [ "natural" ] }, >+ $("#holds-ratios").kohaTable( >+ { >+ order: [ >+ [2, "desc"], >+ [3, "asc"], > ], >- "pagingType": "full", >- "autoWidth": false >- }, table_settings); >+ columnDefs: [ >+ { type: "anti-the", targets: ["anti-the"] }, >+ { type: "natural", targets: ["natural"] }, >+ ], >+ pagingType: "full", >+ autoWidth: false, >+ }, >+ table_settings >+ ); > }); > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 5af5b9b8952..df0be32c04b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -1466,7 +1466,6 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'calendar.inc' %] > [% Asset.js("js/pages/circulation.js") | $raw %] > [% Asset.js("js/modal_printer.js") | $raw %] >@@ -1527,13 +1526,16 @@ > Dopop('/cgi-bin/koha/recalls/recall_pickup_slip.pl?recall_id=[% recall_id | uri %]'); > [% END %] > >- var returns_table = KohaTable("checkedintable", { >- "searching":false, >- "paginate":false, >- "info": false, >- "ordering":false, >- "dom": '<"table_controls"B>rt', >- }, table_settings); >+ var returns_table = $("#checkedintable").kohaTable( >+ { >+ searching: false, >+ paginate: false, >+ info: false, >+ ordering: false, >+ dom: '<"table_controls"B>rt', >+ }, >+ table_settings >+ ); > > $("#exemptcheck").change(function () { > if (this.checked == true) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index c7e0040cd12..76b457569f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -347,7 +347,6 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function() { > var holdst; >@@ -366,11 +365,14 @@ > $('#holdst thead input').on('change keyup keydown', filterColumn); > > var table_settings = [% TablesSettings.GetTableSettings('circ', 'view_holdsqueue', 'holds-table', 'json') | $raw %]; >- var holdst = KohaTable("holdst", { >- "dom": 'B<"clearfix">t', >- "orderCellsTop": true, >- "paginate": false >- }, table_settings); >+ var holdst = $("#holdst").kohaTable( >+ { >+ dom: 'B<"clearfix">t', >+ orderCellsTop: true, >+ paginate: false, >+ }, >+ table_settings >+ ); > > }); > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index 3f29fff5601..b3059e65abd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -186,7 +186,6 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > var MSG_CANCEL_SELECTED = _("Cancel selected (%s)"); > var holdst_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %]; >@@ -194,21 +193,29 @@ > var holdscr_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds_awaiting_pickup', 'holdscr', 'json' ) | $raw %]; > > $(document).ready(function() { >+ $("#holdst").kohaTable( >+ { >+ pagingType: "full", >+ order: [[1, "asc"]], >+ }, >+ holdst_table_settings >+ ); > >- KohaTable("holdst", { >- "pagingType": "full", >- "order": [[1, 'asc']] >- }, holdst_table_settings); >+ $("#holdso").kohaTable( >+ { >+ pagingType: "full", >+ order: [[1, "asc"]], >+ }, >+ holdso_table_settings >+ ); > >- KohaTable("holdso", { >- "pagingType": "full", >- "order": [[1, 'asc']] >- }, holdso_table_settings); >- >- KohaTable("holdscr", { >- "pagingType": "full", >- "order": [[1, 'asc']] >- }, holdscr_table_settings); >+ $("#holdscr").kohaTable( >+ { >+ pagingType: "full", >+ order: [[1, "asc"]], >+ }, >+ holdscr_table_settings >+ ); > > let cancel_link; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index e2d3fb96557..c153be5e652 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -327,7 +327,6 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > var table_settings = [% TablesSettings.GetTableSettings( 'coursereserves', 'reserves', 'course_reserves_table', 'json' ) | $raw %]; > $(document).ready(function(){ >@@ -341,10 +340,13 @@ > $('#rm_items').submit(); > }); > >- var rtable = KohaTable("course_reserves_table", { >- "pagingType": "full", >- "autoWidth": false, >- }, table_settings ); >+ var rtable = $("#course_reserves_table").kohaTable( >+ { >+ pagingType: "full", >+ autoWidth: false, >+ }, >+ table_settings >+ ); > > $("#course_reserves_table").on( 'click', " .delete_item", function(e){ > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index 1725a18520c..3ff982c93dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -93,14 +93,16 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > var table_settings = [% TablesSettings.GetTableSettings( 'coursereserves', 'courses', 'course_reserves_table', 'json' ) | $raw %]; > $(document).ready(function() { >- var ctable = KohaTable("course_reserves_table", { >- "pagingType": "full", >- "autoWidth": false >- }, table_settings ); >+ var ctable = $("#course_reserves_table").kohaTable( >+ { >+ pagingType: "full", >+ autoWidth: false, >+ }, >+ table_settings >+ ); > }); > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index e2bc47ae821..e33aa4ea5aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -430,7 +430,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'format_price.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > <script> >@@ -442,11 +441,14 @@ > var txtActivefilter = _("Filter paid transactions"); > var txtInactivefilter = _("Show all transactions"); > var table_settings = [% TablesSettings.GetTableSettings('members', 'fines', 'account-fines', 'json') | $raw %]; >- var table_account_fines = KohaTable("table_account_fines", { >- "pagingType": "full", >- "order": [[0, 'desc']], >- "dom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >- }, table_settings); >+ var table_account_fines = $("#table_account_fines").kohaTable( >+ { >+ pagingType: "full", >+ order: [[0, "desc"]], >+ dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >+ }, >+ table_settings >+ ); > $("#filter_c").html('<p><a href="#" id="filter_transacs"><i class="fa fa-filter"></i> '+txtActivefilter+'</a>'); > $('#filter_transacs').click(function(e) { > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index 5b3cd3c49e6..631880c53ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -121,7 +121,6 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > <script> >@@ -131,10 +130,13 @@ > //Remove item type column settings > table_settings['columns'] = table_settings['columns'].filter(function(c){return c['columnname'] != 'itemtype';}); > [% END %] >- var table = KohaTable("table_holdshistory", { >- "pagingType": "full", >- "order": [[4, 'desc']] >- }, table_settings); >+ var table = $("#table_holdshistory").kohaTable( >+ { >+ pagingType: "full", >+ order: [[4, "desc"]], >+ }, >+ table_settings >+ ); > }); > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index 10d6ead820c..da7b9fcdf53 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -417,14 +417,13 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function () { > $(".delete").click(function () { > return confirm(_("Are you sure you want to delete this delivery?")); > }); > }); >- KohaTable("deliveries", { >+ $("#deliveries").kohaTable({ > pagingType: "full", > autoWidth: false, > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index 92cccf3ccc9..d813a00c951 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -172,30 +172,38 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'slip-print.inc' #printThenClose %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > var checkouts_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-checkouts', 'json' ) | $raw %]; > var holds_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-holds', 'json' ) | $raw %]; > var fines_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-fines', 'json' ) | $raw %]; > > function initTables(){ >- KohaTable("print-summary-checkouts", { >- "dom": '<"dt-info"><"top pager"<"table_controls"B>>t', >- "paging": false, >- "autoWidth": false, >- }, checkouts_columns); >+ $("#print-summary-checkouts").kohaTable( >+ { >+ dom: '<"dt-info"><"top pager"<"table_controls"B>>t', >+ paging: false, >+ autoWidth: false, >+ }, >+ checkouts_columns >+ ); > >- KohaTable("print-summary-holds", { >- "dom": '<"dt-info"><"top pager"<"table_controls"B>>t', >- "paging": false, >- "autoWidth": false, >- }, holds_columns); >+ $("#print-summary-holds").kohaTable( >+ { >+ dom: '<"dt-info"><"top pager"<"table_controls"B>>t', >+ paging: false, >+ autoWidth: false, >+ }, >+ holds_columns >+ ); > >- KohaTable("print-summary-fines", { >- "dom": '<"dt-info"><"top pager"<"table_controls"B>>t', >- "paging": false, >- "autoWidth": false, >- }, fines_columns); >+ $("#print-summary-fines").kohaTable( >+ { >+ dom: '<"dt-info"><"top pager"<"table_controls"B>>t', >+ paging: false, >+ autoWidth: false, >+ }, >+ fines_columns >+ ); > } > > if( autoprint ){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 73cff4dd615..3d8641ff1cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -226,7 +226,6 @@ > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > function enableCheckboxActions(){ > // Enable/disable controls if checkboxes are checked >@@ -281,10 +280,13 @@ > }); > > var table_settings = [% TablesSettings.GetTableSettings('members', 'pay', 'pay-fines-table', 'json') | $raw %]; >- KohaTable("finest", { >- "paging": false, >- "autoWidth": false >- }, table_settings ); >+ $("#finest").kohaTable( >+ { >+ paging: false, >+ autoWidth: false, >+ }, >+ table_settings >+ ); > }); > </script> > [% END %] >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 41e7e8b896b..9166f33f12c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -160,7 +160,6 @@ > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'modals/checkout_renewals.inc' %] > [% INCLUDE 'js-date-format.inc' %] > [% INCLUDE 'js-patron-format.inc' %] >@@ -168,15 +167,19 @@ > <script id="js"> > $(document).ready(function() { > [% IF Koha.Preference('RecordStaffUserOnCheckout') %] >+ // FIXME This cannot work without bKohaColumnsUseNames > 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", { >- "pagingType": "full", >- "order": [[column_sort, 'desc']] >- }, table_settings); >+ var table = $("#table_readingrec").kohaTable( >+ { >+ pagingType: "full", >+ order: [[column_sort, "desc"]], >+ }, >+ table_settings >+ ); > > let table_dt = table.DataTable(); > $("#tabs a[data-bs-toggle='tab']").on("shown.bs.tab", function (e) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index 67bd3ee8da2..98a07a6c6e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -6,7 +6,6 @@ > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-[% INCLUDE 'columns_settings.inc' %] > <title > >[% FILTER collapse %] > [% list.name | html %] >@@ -241,9 +240,12 @@ > $('#patrons_to_add_fieldset').hide(); > > var table_settings = [% TablesSettings.GetTableSettings('members', 'patron-lists', 'patron-list-table', 'json') | $raw %] >- KohaTable('patron-list-table', { >- "pagingType": "full" >- }, table_settings); >+ $("#patron-list-table").kohaTable( >+ { >+ pagingType: "full", >+ }, >+ table_settings >+ ); > > function AddPatron( patron_name, value, container, input_name ) { > div = "<div id='borrower_" + value + "'>" + patron_name + " ( <a href='#' class='removePatron'><i class='fa fa-trash-can' aria-hidden='true'></i> " + MSG_REMOVE_PATRON + " </a> ) <input type='hidden' name='" + input_name + "' value='" + value + "' /></div>"; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index fbb0abe35ae..031be79581a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >@@ -301,7 +301,6 @@ > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function () { > $(".uninstall_plugin").on("click", function () { >@@ -314,7 +313,7 @@ > $("#plugin-search-form").submit(); > }); > >- KohaTable("installed_plugins", { >+ $("#installed_plugins").kohaTable({ > paginate: false, > }); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >index 124d7f05660..797d0116e34 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >@@ -248,7 +248,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'format_price.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > function moneyFormat(textObj) { > var newValue = textObj.value; >@@ -437,11 +436,15 @@ > }); > > var items_table_settings = [% TablesSettings.GetTableSettings('pos', 'pay', 'invoices', 'json') | $raw %]; >- var items_table = KohaTable("invoices", { >- "pagingType": "full", >- "order": [[ 0, "asc" ]], >- "autoWidth": false >- }, items_table_settings, false); >+ var items_table = $("#invoices").kohaTable( >+ { >+ pagingType: "full", >+ order: [[0, "asc"]], >+ autoWidth: false, >+ }, >+ items_table_settings, >+ false >+ ); > > $("#invoices").on("click", ".add_button", function(e) { > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >index 2c22e8c435a..53362b7c7a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >@@ -341,7 +341,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > function changeRemovedDateTrStatus() { > var Cellvalue = $("input[name='Cellvalue']:checked").val(); >@@ -365,6 +364,7 @@ > }); > changeRemovedDateTrStatus(); > >+ // FIXME This does not work, we need to pass table settings, not the columns > columns_settings = [% FILTER collapse %] > [ > { >@@ -390,10 +390,13 @@ > ]; > [% END %] > >- var catalogue_stats = KohaTable("catalogue_stats", { >- 'autoWidth': false, >- 'paging': false, >- }, columns_settings ); >+ var catalogue_stats = $("#catalogue_stats").kohaTable( >+ { >+ autoWidth: false, >+ paging: false, >+ }, >+ columns_settings >+ ); > }); > </script> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 1536ac86732..55afc39ff05 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -1699,7 +1699,6 @@ > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% IF ( saved1 ) %] >- [% INCLUDE 'columns_settings.inc' %] > [% Asset.js( "lib/jsdiff/jsdiff.min.js" ) | $raw %] > [% END %] > [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %] >@@ -2153,15 +2152,17 @@ > > [% IF (saved1) %] > var table_settings = [% TablesSettings.GetTableSettings( 'reports', 'saved-sql', 'table_reports', 'json' ) | $raw %]; >- var rtable = KohaTable("table_reports", { >- "autoWidth": false, >- "pagingType": 'full', >- "order": [[ 1, "asc" ]], >- "language": { >- "zeroRecords": _("No matching reports found") >+ var rtable = $("#table_reports").kohaTable( >+ { >+ autoWidth: false, >+ pagingType: "full", >+ order: [[1, "asc"]], >+ language: { >+ zeroRecords: _("No matching reports found"), >+ }, > }, >- >- }, table_settings); >+ table_settings >+ ); > let table_dt = rtable.DataTable(); > > $("#tabs a[data-bs-toggle='tab']").on("shown.bs.tab", function (e) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index 36fccf9c8fc..02b37fcc959 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -193,23 +193,27 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings( 'reports', 'lostitems', 'lostitems-table', 'json' ) | $raw %]; > [% IF csv_profiles.count %] > // Add the first (checkbox) column if it is displayed >+ // FIXME This cannot work without bKohaColumnsUseNames > table_settings['columns'].unshift({cannot_be_modified: 1, cannot_be_toggled: 1, columnname: 'itemnumber', is_hidden: 0}); > [% END %] > >- var lostitems_table = KohaTable("lostitems-table", { >- "order": [], >- "columnDefs": [ >- { "orderable": false, "searchable": false, "targets": [ 'NoSort' ] } >- ], >- "autoWidth": false, >- "paginate": false, >- }, table_settings, 'with_filters'); >+ var lostitems_table = $("#lostitems-table").kohaTable( >+ { >+ order: [], >+ columnDefs: [ >+ { orderable: false, searchable: false, targets: ["NoSort"] }, >+ ], >+ autoWidth: false, >+ paginate: false, >+ }, >+ table_settings, >+ "with_filters" >+ ); > > function itemSelectionBuildExportLink() { > var itemnumbers = new Array(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 03182f666f5..71ae52d44e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -168,13 +168,15 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > var table_settings = [% TablesSettings.GetTableSettings( 'reports', 'orders_by_fund', 'funds-table', 'json' ) | $raw %]; > $(document).ready( function () { >- var funds_table = KohaTable("funds", { >- 'autoWidth': false, >- }, table_settings ); >+ var funds_table = $("#funds").kohaTable( >+ { >+ autoWidth: false, >+ }, >+ table_settings >+ ); > > showallbudgets = $('#budgetfilter').html(); > $('#budgetfilter .b_inactive').remove(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 7f76c4f89fa..558b5e0d9f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -1423,7 +1423,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'select2.inc' %] > [% Asset.js("js/holds.js") | $raw %] > [% Asset.js("js/form-submit.js") | $raw %] >@@ -1435,10 +1434,13 @@ > <script> > $(document).ready(function () { > hold_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds', 'patron_holds_table', 'json' ) | $raw %]; >- KohaTable("patron_holds_table", { >- "bPaginate":false, >- "bKohaColumnsUseNames": true, >- }, hold_table_settings); >+ $("#patron_holds_table").kohaTable( >+ { >+ bPaginate: false, >+ bKohaColumnsUseNames: true, >+ }, >+ hold_table_settings >+ ); > }); > var biblionumbers = [[% biblionumbers.join(', ') | $raw %]]; > var borrowernumber = "[% patron.borrowernumber | $raw %]"; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index 205902f6cfa..70aa669203a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -454,7 +454,6 @@ > [% Asset.js("js/mana.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > // the english words used in display purposes > var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose hemisphere:"),_("Northern"),_("Southern", >@@ -467,16 +466,18 @@ > }) > > var table_settings = [% TablesSettings.GetTableSettings( 'serials', 'subscription-detail', 'orders', 'json' ) | $raw %]; >- var table = KohaTable("orders", { >- "columnDefs": [ >- { "visible": false, "targets": [ 'NoVisible' ] }, >- { "orderable": false, "targets": ["_all"] }, >- ], >- >- "paginate": false, >- "autoWidth": false, >- "ordering": false, >- }, table_settings); >+ var table = $("#orders").kohaTable( >+ { >+ columnDefs: [ >+ { visible: false, targets: ["NoVisible"] }, >+ { orderable: false, targets: ["_all"] }, >+ ], >+ paginate: false, >+ autoWidth: false, >+ ordering: false, >+ }, >+ table_settings >+ ); > > [% IF orders_grouped.size %] > $(table).treetable({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 1b0931861c3..af1d3cb4cb1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -716,7 +716,7 @@ > [% SWITCH m.code %] > [% CASE 'already_exists' %] > <span >- >The suggestion has not been added. A suggestion with this title already exists (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | uri %]&op=show">suggestion #[% m.id | html %]</a >+ >The suggestion has not been added. A suggestion with this title already exists (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% m.id | html %]&op=show">suggestion #[% m.id | html %]</a > >)</span > > > [% CASE 'biblio_exists' %] >@@ -1445,7 +1445,6 @@ > [% END %] > [% IF op == 'else' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > $(document).ready(function() { > if( $("#suggestiontabs .tab-pane.active").length < 1 ){ >@@ -1456,10 +1455,13 @@ > > [% FOREACH suggestion IN suggestions %] > [% IF suggestion.suggestions.size %] >- KohaTable("table_[% suggestion.suggestiontype | html %]", { >- "sorting": [[ 4, "asc" ]], >- "autoWidth": false, >- }, table_settings ); >+ $("#table_[% suggestion.suggestiontype | html %]").kohaTable( >+ { >+ sorting: [[4, "asc"]], >+ autoWidth: false, >+ }, >+ table_settings >+ ); > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index 081435fba55..4b028bafde3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -407,7 +407,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > function checkForm() { > if ( $('#uploadbarcodes').val() && $('#barcodelist').val() ) { >@@ -461,7 +460,7 @@ > > $(document).ready(function(){ > var table_settings = [% TablesSettings.GetTableSettings( 'tools', 'inventory', 'inventoryt', 'json' ) | $raw %]; >- inventorydt = KohaTable("inventoryt", { >+ inventorydt = $("#inventoryt").kohaTable({ > "pagingType": 'full_numbers', > [% IF compareinv2barcd %] > // sort on callnumber >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index 4fc7daf7d70..c8e7dfbd459 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -483,7 +483,6 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'columns_settings.inc' %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% Asset.js("js/members-patron-selections.js") | $raw %] > <script> >@@ -501,10 +500,13 @@ > [% END %] > $(document).ready(function() { > [% IF borrowers %] >- let patron_table = KohaTable("borrowerst", { >- "order": [[ 1, "asc" ]], >- "autoWidth": true, >- }, table_settings); >+ let patron_table = $("#borrowerst").kohaTable( >+ { >+ order: [[1, "asc"]], >+ autoWidth: true, >+ }, >+ table_settings >+ ); > > $("#selectallbutton").click(function() { > $("#borrowerst").find("input:checkbox").each(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 0eb5a908e5b..48c577540da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -360,7 +360,6 @@ > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("js/file-upload.js") | $raw %] >- [% INCLUDE 'columns_settings.inc' %] > <script> > function StartUpload() { > if( $('#fileToUpload').prop('files').length == 0 ) return; >@@ -493,8 +492,7 @@ > table_settings['columns'].splice(5, 1); > [% END %] > $(document).ready(function() { >- KohaTable("uploadresults",{ >- }, table_settings); >+ $("#uploadresults").kohaTable({}, table_settings); > > [% IF msg %] > ShowAlerts( [% msg | html %] ); >diff --git a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js b/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js >index c2e34ceebe0..cfe10df1d8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/cataloging_additem.js >@@ -1,4 +1,4 @@ >-/* global KOHA searchid biblionumber frameworkcode popup op LABEL_EDIT_ITEM LABEL_DELETE_ITEM MSG_FORM_NOT_SUBMITTED MSG_MANDATORY_FIELDS_EMPTY MSG_ADD_MULTIPLE_ITEMS MSG_ENTER_NUM_ITEMS MSG_CONFIRM_DELETE_ITEM MSG_CONFIRM_ADD_ITEM columns_settings CheckMandatorySubfields CheckMultipleAdd */ >+/* global KOHA searchid biblionumber frameworkcode popup op LABEL_EDIT_ITEM LABEL_DELETE_ITEM MSG_FORM_NOT_SUBMITTED MSG_MANDATORY_FIELDS_EMPTY MSG_ADD_MULTIPLE_ITEMS MSG_ENTER_NUM_ITEMS MSG_CONFIRM_DELETE_ITEM MSG_CONFIRM_ADD_ITEM table_settings CheckMandatorySubfields CheckMultipleAdd */ > > var browser = KOHA.browser(searchid, parseInt(biblionumber, 10)); > browser.show(); >@@ -58,8 +58,7 @@ $(document).ready(function () { > // Skip the first column > table_settings["columns"].unshift({ cannot_be_toggled: "1" }); > >- var itemst = KohaTable( >- "itemst", >+ var itemst = $("#itemst").kohaTable( > { > paging: false, > info: false, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/categories.js b/koha-tmpl/intranet-tmpl/prog/js/categories.js >index 786613d50e6..be4fc5923e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/categories.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/categories.js >@@ -33,8 +33,7 @@ jQuery.validator.addMethod( > ); > > $(document).ready(function () { >- KohaTable( >- "patron_categories", >+ $("#patron_categories").kohaTable( > { > columnDefs: [ > { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >index c317d3cf5b7..f11f755964a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >@@ -54,8 +54,7 @@ function LoadIssuesTable() { > c => c.columnname == "export" > ).is_hidden = 1; > } >- issuesTable = KohaTable( >- "issues-table", >+ issuesTable = $("#issues-table").kohaTable( > { > language: { > emptyTable: msg_loading, >@@ -1089,8 +1088,7 @@ $(document).ready(function () { > var relativesIssuesTable; > $("#relatives-issues-tab").click(function () { > if (!relativesIssuesTable) { >- relativesIssuesTable = KohaTable( >- "relatives-issues-table", >+ relativesIssuesTable = $("#relatives-issues-table").kohaTable( > { > autoWidth: false, > dom: '<"table_controls"B>rt', >diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js >index fda88ec7dd4..b781774e762 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js >@@ -143,8 +143,7 @@ $(document).ready(function () { > var holds = new Array(); > if (!holdsTable) { > var title; >- holdsTable = KohaTable( >- "holds-table", >+ holdsTable = $("#holds-table").kohaTable( > { > autoWidth: false, > dom: '<"table_controls"B>rt', >diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js b/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js >index 47b9be13928..536c23727b1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js >@@ -248,7 +248,7 @@ $(document).ready(function () { > .find(".dt-paging"); > pagination.toggle(this.api().page.info().pages > 1); > }; >- KohaTable(service.id, tableDef, table_settings); >+ $("#" + service.id).kohaTable(tableDef, table_settings); > }); > }; > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js >index b888841d173..1bbfc869161 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-modal.js >@@ -1003,7 +1003,7 @@ > } > > function buildTable(identifiers) { >- table = KohaTable("identifier-table", { >+ table = $("#identifier-table").kohaTable({ > processing: true, > ordering: false, > paging: false, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-table.js b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-table.js >index 3ff97e50784..4b01ebf1b80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/ill-batch-table.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-batch-table.js >@@ -45,9 +45,8 @@ > } > > // Initialise the Datatable >- // FIXME: This should be a kohaTable not KohaTable > var initTable = function () { >- return KohaTable("ill-batch-requests", { >+ return $("#ill-batch-requests").kohaTable({ > data: batchesProxy.data, > columns: [ > { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/letter.js b/koha-tmpl/intranet-tmpl/prog/js/letter.js >index d2633bcb88d..425c9616146 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/letter.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/letter.js >@@ -1,5 +1,5 @@ > /* Variables defined in letter.tt: */ >-/* global _ module add_form copy_form no_op_set code interface theme KohaTable table_settings */ >+/* global _ module add_form copy_form no_op_set code interface theme kohaTable table_settings */ > > var modal_loading = > '<div id="loading"><img src="' + >@@ -82,8 +82,7 @@ function confirmFormatOverwrite(event) { > } > > $(document).ready(function () { >- var ntable = KohaTable( >- "lettert", >+ var ntable = $("#lettert").kohaTable( > { > autoWidth: false, > paging: false, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js b/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js >index d6526f73faa..0c090848971 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js >@@ -1,4 +1,4 @@ >-/* global __ KohaTable table_settings */ >+/* global __ kohaTable table_settings */ > $(document).ready(function () { > window.modaction_legend_innerhtml = $("#modaction_legend").text(); > window.action_submit_value = $("#action_submit").val(); >@@ -139,7 +139,7 @@ $(document).ready(function () { > updateAllEvery(); > }); > >- KohaTable("templatest", {}, table_settings); >+ $("#templatest").kohaTable({}, table_settings); > > $(".confirm-delete-action").on("click", function () { > return confirm( >diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js b/koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js >index 815b37477c9..63ecc4e7585 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/batchMod.js >@@ -1,4 +1,4 @@ >-/* global KohaTable allColumns Cookies */ >+/* global kohaTable allColumns Cookies */ > // Set expiration date for cookies > var date = new Date(); > date.setTime(date.getTime() + 365 * 24 * 60 * 60 * 1000); >@@ -170,7 +170,7 @@ function hideAllColumns() { > } > > $(document).ready(function () { >- var items_table = KohaTable("itemst", { >+ var items_table = $("#itemst").kohaTable({ > columnDefs: [ > { targets: [0, 1], orderable: false, searchable: true }, > { targets: [0], visible: false }, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js >index faced5caeed..9aa5dc652ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js >@@ -1,4 +1,4 @@ >-/* global KohaTable columns_settings Sortable */ >+/* global kohaTable columns_settings Sortable */ > > function init() { > $("#ajax_status").hide(); >@@ -71,8 +71,7 @@ $(document).ready(function () { > }); > } > >- KohaTable( >- "stock_rotation_manage_items", >+ $("#stock_rotation_manage_items").kohaTable( > { > columnDefs: [ > { orderable: false, searchable: false, targets: ["NoSort"] }, >@@ -84,8 +83,7 @@ $(document).ready(function () { > stock_rotation_items_table_settings > ); > >- KohaTable( >- "stock_rotation", >+ $("#stock_rotation").kohaTable( > { > columnDefs: [ > { orderable: false, searchable: false, targets: ["NoSort"] }, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js b/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js >index 7a9ff759dc1..224a2a2ecda 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/restrictiontypes.js >@@ -26,7 +26,7 @@ jQuery.validator.addMethod( > ); > > $(document).ready(function () { >- KohaTable("restriction_types", { >+ $("#restriction_types").kohaTable({ > columnDefs: [ > { > targets: [-1], >diff --git a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js b/koha-tmpl/intranet-tmpl/prog/js/viewlog.js >index 45b06704c0b..417dcaf18b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/viewlog.js >@@ -120,8 +120,7 @@ $(document).ready(function () { > } > }); > >- var logst = KohaTable( >- "logst", >+ var logst = $("#logst").kohaTable( > { > autoWidth: false, > order: [[0, "desc"]], >-- >2.48.1
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 26553
:
175186
|
175187
|
175188
|
175189
|
175190
|
175191
|
175874
|
175875
|
175876
|
175877
|
175878
|
175879
|
176359
|
176360
|
176361
|
176362
|
176363
|
176364
|
176588
|
176589
|
176590
|
176591
|
177087
|
177088
|
177089
|
177090
|
177091
|
177092
|
177152
|
177153
|
177154
|
177155
|
177156
|
177157
|
177158
|
177234
|
177235
|
177236
|
177237
|
177238
|
177239
|
177240
|
177241
|
177242
|
177243
|
177246
|
177247
|
177264
|
177265
|
177271
|
177888
|
177889
|
177890
|
177891
|
177892
|
177893
|
177894
|
177895
|
177896
|
177897
|
177898
|
177899
|
177900
|
178508
|
178509
|
178510
|
178511
|
178512
|
178513
|
178514
|
178515
|
178516
|
178517
|
178518
|
178519
|
178520
|
178521
|
178522
|
178523
|
178524
|
178525
|
178526
|
178527
|
178528
|
178529
|
178530
|
178531
|
178532
|
178533