From cf53538713a27737e30b7c47cf9df93d200fcce6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 28 Nov 2024 16:57:21 +0100 Subject: [PATCH] Bug 26553: Replace KohaTable with kohaTable Signed-off-by: Lucas Gass --- .../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 | 7 ++-- .../prog/en/modules/admin/currency.tt | 6 +-- .../prog/en/modules/admin/desks.tt | 5 +-- .../prog/en/modules/admin/itemtypes.tt | 10 +++-- .../en/modules/admin/patron-attr-types.tt | 12 +++--- .../prog/en/modules/admin/smart-rules.tt | 20 ++++++---- .../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 | 39 ++++++++++-------- .../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 | 7 ++-- .../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 | 5 +-- .../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 | 12 +++--- .../prog/en/modules/tools/inventory.tt | 3 +- .../prog/en/modules/tools/modborrowers.tt | 14 ++++--- .../prog/en/modules/tools/upload.tt | 4 +- .../prog/js/cataloging_additem.js | 17 ++++---- koha-tmpl/intranet-tmpl/prog/js/categories.js | 3 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 4 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- .../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 | 13 +++--- .../prog/js/marc_modification_templates.js | 5 +-- .../intranet-tmpl/prog/js/pages/batchMod.js | 14 +++---- .../prog/js/pages/stockrotation.js | 40 +++++++++++-------- .../intranet-tmpl/prog/js/restrictiontypes.js | 27 +++++++------ koha-tmpl/intranet-tmpl/prog/js/viewlog.js | 13 +++--- 56 files changed, 398 insertions(+), 314 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 529018ab100..aa1ec5a4563 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 @@ -225,13 +225,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' %] 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 278d10815f6..8ecc8cb5cb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -542,7 +542,6 @@ [% Asset.js("js/admin-menu.js") | $raw %] [% INCLUDE 'greybox.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] 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 4ec21fb4549..22fa973a944 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 @@ -1465,18 +1465,22 @@ [% Asset.js("js/admin-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] - [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'format_price.inc' %] [% 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 %] @@ -2017,12 +2016,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 %] @@ -2037,11 +2039,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 8025e2bc2f6..33937add33e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -136,7 +136,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] -[% INCLUDE 'columns_settings.inc' %] [% 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 0b56f0d2d61..8b86f13c95f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -361,7 +361,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'select2.inc' %] [% 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 fad019d7415..fbcef91a3b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -202,19 +202,24 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] [% 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 372fa57626a..191f9cf458f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1458,7 +1458,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 %] @@ -1519,13 +1518,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 b9c051d67cd..0505f970324 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 @@ -324,7 +324,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] 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 2405b4da0f5..1d999b0e460 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -210,7 +210,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] [% 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 13cc95051b1..6cba36cefba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -394,7 +394,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 %] [% 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 4bdfe610921..a24807e1a1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -451,16 +451,15 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'str/members-menu.inc' %] 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 1fd878dd136..ca14b739840 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 @@ -216,30 +216,38 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'slip-print.inc' #printThenClose %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] [% 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 771cedafa75..7575daf1ffe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -175,7 +175,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' %] @@ -183,15 +182,19 @@ 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 058585c83c2..58a25546894 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -246,7 +246,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'format_price.inc' %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %] [% 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 4701ececae0..39bd0fb17be 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 @@ -1562,7 +1562,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 %] @@ -2017,15 +2016,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 48baa773a74..7c4e5b8f73c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -206,23 +206,27 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - [% INCLUDE 'columns_settings.inc' %]