Bugzilla – Attachment 183473 Details for
Bug 39715
Do not quote DataTables options
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39715: Do not quote DataTables options
Bug-39715-Do-not-quote-DataTables-options.patch (text/plain), 150.22 KB, created by
Owen Leonard
on 2025-06-24 19:15:10 UTC
(
hide
)
Description:
Bug 39715: Do not quote DataTables options
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-06-24 19:15:10 UTC
Size:
150.22 KB
patch
obsolete
>From 8c44ae90af723368be24729431c1fb74014baaac Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 22 Apr 2025 17:45:33 +0000 >Subject: [PATCH] Bug 39715: Do not quote DataTables options > >This patch updates templates so that the options passed to DataTables >(via kohaTable) are not quoted. The quotes are not necessary, and >are not consistent with official DataTables documentation. This >establishes a standard for us to follow in the future. > >The patch also corrects some option names which required upates, >particularly "sorting" -> "order". > >To test, apply the patch and test updated DataTables. > >Sponsored-by: Athens County Public Libraries >--- > .../tables/items/catalogue_detail.inc | 3 +- > .../prog/en/includes/patron-search.inc | 162 +++++++++--------- > .../prog/en/modules/acqui/acqui-home.tt | 14 +- > .../prog/en/modules/acqui/edifactmsgs.tt | 74 ++++---- > .../prog/en/modules/acqui/lateorders.tt | 8 +- > .../prog/en/modules/acqui/orderreceive.tt | 128 +++++++------- > .../prog/en/modules/acqui/parcel.tt | 84 ++++----- > .../prog/en/modules/acqui/parcels.tt | 2 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 16 +- > .../prog/en/modules/admin/aqbudgets.tt | 18 +- > .../modules/admin/auth_subfields_structure.tt | 1 - > .../prog/en/modules/admin/background_jobs.tt | 66 +++---- > .../prog/en/modules/admin/branches.tt | 84 ++++----- > .../prog/en/modules/admin/cities.tt | 48 +++--- > .../admin/identity_provider_domains.tt | 64 +++---- > .../en/modules/admin/marc-overlay-rules.tt | 22 +-- > .../prog/en/modules/admin/smtp_servers.tt | 68 ++++---- > .../prog/en/modules/bookings/list.tt | 76 ++++---- > .../prog/en/modules/catalogue/detail.tt | 128 +++++++------- > .../prog/en/modules/catalogue/itemsearch.tt | 20 +-- > .../prog/en/modules/cataloguing/concerns.tt | 52 +++--- > .../circ/circulation_batch_checkouts.tt | 3 +- > .../prog/en/modules/circ/curbside_pickups.tt | 2 +- > .../prog/en/modules/circ/pendingbookings.tt | 92 +++++----- > .../prog/en/modules/clubs/patron-clubs-tab.tt | 2 +- > .../prog/en/modules/members/discharges.tt | 1 - > .../prog/en/modules/patron_lists/lists.tt | 2 +- > .../intranet-tmpl/prog/en/modules/pos/pay.tt | 33 ++-- > .../prog/en/modules/pos/register.tt | 38 ++-- > .../modules/reports/guided_reports_start.tt | 8 +- > .../prog/en/modules/reports/itemslost.tt | 1 - > .../prog/en/modules/suggestion/suggestion.tt | 2 +- > .../en/modules/tools/batch_delete_records.tt | 6 +- > .../modules/tools/batch_extend_due_dates.tt | 1 - > .../tools/batch_record_modification.tt | 6 +- > .../prog/en/modules/tools/inventory.tt | 14 +- > .../en/modules/tools/manage-marc-import.tt | 30 ++-- > .../prog/en/modules/virtualshelves/shelves.tt | 34 ++-- > .../virtualshelves/tables/shelves_results.tt | 2 +- > .../intranet-tmpl/prog/js/addorderiso2709.js | 1 - > koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 1 - > .../prog/js/marc_subfields_structure.js | 1 - > .../bootstrap/en/modules/opac-account.tt | 26 +-- > .../en/modules/opac-course-reserves.tt | 2 +- > .../bootstrap/en/modules/opac-detail.tt | 2 +- > .../bootstrap/en/modules/opac-holdshistory.tt | 2 +- > .../bootstrap/en/modules/opac-suggestions.tt | 10 +- > .../bootstrap/en/modules/opac-tags.tt | 2 +- > .../bootstrap/en/modules/opac-topissues.tt | 2 +- > .../bootstrap/en/modules/opac-user.tt | 18 +- > .../bootstrap/en/modules/sco/sco-main.tt | 2 +- > 51 files changed, 735 insertions(+), 749 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc >index 67440510e69..d7f72296a4a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc >@@ -337,8 +337,7 @@ > > var items_table = $("#" + tab_id + '_table').kohaTable({ > ajax: { url: item_table_url }, >- order: [], >- embed, >+ embed, > autoWidth: false, > bKohaColumnsUseNames: true, > columns: [ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index 85184bdc6aa..206b646a410 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -476,9 +476,9 @@ > [% SET embed = ['extended_attributes','library'] %] > let table_node = $("#[% table_id | html %]"); > patrons_table = table_node.kohaTable({ >- "ajax": { >- "url": patron_search_url, >- "dataSrc": function ( json ) { >+ ajax: { >+ url: patron_search_url, >+ dataSrc: function ( json ) { > [% IF redirect_if_one_result %] > // redirect if there is only 1 result. > // Do not redirect if state has been loaded >@@ -496,7 +496,7 @@ > } > }, > [% IF open_on_row_click OR preview_on_name_click OR remember_selections %] >- "drawCallback": function( settings ) { >+ drawCallback: function( settings ) { > var api = this.api(); > var data = api.data(); > if ( data.length == 0 ) return; >@@ -520,8 +520,8 @@ > [% END %] > }, > [% END %] >- "deferLoading": defer_loading, >- "columns": [ >+ deferLoading: defer_loading, >+ columns: [ > [% FOR column IN columns %] > [% IF default_sort_column == column %] > [% order_column_index = loop.count - 1%] >@@ -529,19 +529,19 @@ > [% SWITCH column %] > [% CASE 'checkbox' %] > { >- "data": "patron_id", >- "searchable": false, >- "orderable": false, >- "render": function( data, type, row, meta ) { >+ data: "patron_id", >+ searchable: false, >+ orderable: false, >+ render: function( data, type, row, meta ) { > return "<label for='check" + data + "' class='content_hidden'>" + _("Select patron") + "</label><input type='checkbox' class='check" + data + " selection' name='borrowernumber' value='" + data + "' />"; > } > } > [% CASE 'cardnumber' %] > { >- "data": "cardnumber", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "cardnumber", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > let patron_id = encodeURIComponent(row.patron_id); > [% IF !open_on_row_click AND CAN_user_circulate_circulate_remaining_permissions %] > return "<a href=\"/cgi-bin/koha/circ/circulation.pl?borrowernumber=" + patron_id + "\" title=\"[% I18N.t("Check out") | html %]\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">" + escape_str(data) + "</a>"; >@@ -553,20 +553,20 @@ > } > [% CASE 'dateofbirth' %] > { >- "data": "date_of_birth", >- "type": "date", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "date_of_birth", >+ type: "date", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return data ? "<span class=\"dateofbirth\">" + escape_str($date(data)) + "<span class=\"agehint\"> (" + _("%s years").format($get_age(data)) + ")</span></span>" : ""; > } > } > [% CASE 'address' %] > { >- "data": "me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > let r = '<div class="address"><ul>'; > r += $format_address(row, { no_line_break: true, include_li: true }); > r += '</div></ul>'; >@@ -575,10 +575,10 @@ > } > [% CASE 'address-library' %] > { >- "data": "me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > let r = '<div class="address"><ul>'; > r += $format_address(row, { no_line_break: true, include_li: true }); > r += '</div></ul>'; >@@ -588,10 +588,10 @@ > } > [% CASE 'name-address' %] > { >- "data": "me.surname:me.preferred_name:me.firstname:me.middle_name:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "me.surname:me.preferred_name:me.firstname:me.middle_name:me.othernames:me.street_number:me.address:me.address2:me.city:me.state:me.postal_code:me.country", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > let patron_id = encodeURIComponent(row.patron_id); > let r = ''; > [% IF ! open_on_row_click %] >@@ -613,10 +613,10 @@ > } > [% CASE 'name' %] > { >- "data": "me.surname:me.preferred_name:me.firstname:me.middle_name:me.othernames", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "me.surname:me.preferred_name:me.firstname:me.middle_name:me.othernames", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > let patron_id = encodeURIComponent(row.patron_id); > [% IF ! open_on_row_click %] > return "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=" + patron_id + "\" class=\"patron_name\" data-borrowernumber=\"" + patron_id + "\" style=\"white-space:nowrap\">" + $patron_to_html(row, { invert_name: 1 }) + "</a>"; >@@ -627,10 +627,10 @@ > } > [% CASE 'branch' %] > { >- "data": "library.name:me.library_id", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "library.name:me.library_id", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > if( !singleBranchMode && row.library.library_id == logged_in_library_id ) { > return "<span class=\"currentlibrary\">" + escape_str(row.library.name) + "</span>"; > } else { >@@ -640,45 +640,45 @@ > } > [% CASE 'category' %] > { >- "data": "category_id", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "category_id", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return escape_str(categories_map[data.toLowerCase()].description); > } > } > [% CASE 'dateexpiry' %] > { >- "data": "expiry_date", >- "type": "date", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "expiry_date", >+ type: "date", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return "<span class=\"dateexpiry" + (new Date(data) < new Date() ? ' expired' : '') + "\">" + (data ? escape_str($date(data)) : '') + "</span>"; > } > } > [% CASE 'borrowernotes' %] > { >- "data": "staff_notes", >- "searchable": true, >- "orderable": true, >+ data: "staff_notes", >+ searchable: true, >+ orderable: true, > [%# We don't escape here, we allow html tag in staff notes %] > } > [% CASE 'phone' %] > { >- "data": "phone", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "phone", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return escape_str(data); > } > } > [% CASE 'checkouts' %][% embed.push('checkouts+count', 'overdues+count') %] > { >- "data": "", >- "searchable": false, >- "orderable": false, >- "render": function( data, type, row, meta ) { >+ data: "", >+ searchable: false, >+ orderable: false, >+ render: function( data, type, row, meta ) { > if ( row.overdues_count ) { > return "<span class='overdue'><strong>"+row.overdues_count + "</strong></span>" + " / " + row.checkouts_count; > } else { >@@ -688,10 +688,10 @@ > } > [% CASE 'account_balance' %][% embed.push('account_balance') %] > { >- "data": "", >- "searchable": false, >- "orderable": false, >- "render": function( data, type, row, meta ) { >+ data: "", >+ searchable: false, >+ orderable: false, >+ render: function( data, type, row, meta ) { > let r = "<span style='text-align: right; display: block;'><a href=\"/cgi-bin/koha/members/boraccount.pl?borrowernumber="+row.patron_id+"\">"; > let balance_str = row.account_balance || 0; > balance_str = balance_str.escapeHtml().format_price(); >@@ -711,10 +711,10 @@ > > [% CASE 'sort1' %] > { >- "data": "statistics_1", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "statistics_1", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > if (data === null) return ''; > let bsort1 = av_bsort1_map[data.toString()]; > return escape_str(bsort1 ? bsort1.lib : data); >@@ -723,10 +723,10 @@ > > [% CASE 'sort2' %] > { >- "data": "statistics_2", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "statistics_2", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > if (data === null) return ''; > let bsort2 = av_bsort2_map[data.toString()]; > return escape_str(bsort2 ? bsort2.lib : data); >@@ -736,7 +736,7 @@ > > [% CASE 'action' %] > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > > let patron_id = encodeURIComponent(row.patron_id); > let action_node = ""; >@@ -764,21 +764,21 @@ > > return action_node; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > } > [% END %] > [% UNLESS loop.last %],[% END %] > [% END %] > ], >- 'embed': [% To.json(embed) | $raw %], >- "order": [[ [% order_column_index | html %], "asc" ]], >- "autoWidth": false, >- 'lengthMenu': [aLengthMenu, aLengthMenuLabel], >- "pagingType": 'full_numbers', >- "pageLength": [% Koha.Preference('PatronsPerPage') | html %], >+ embed: [% To.json(embed) | $raw %], >+ order: [[ [% order_column_index | html %], "asc" ]], >+ autoWidth: false, >+ lengthMenu: [aLengthMenu, aLengthMenuLabel], >+ pagingType: 'full_numbers', >+ pageLength: [% Koha.Preference('PatronsPerPage') | html %], > [% IF sticky_header %] >- "initComplete": function(settings, json) { >+ initComplete: function(settings, json) { > $("#[% sticky_header | html %]").show(); > }, > [% END %] >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 1951395a132..7049c2f18e1 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 >@@ -213,7 +213,7 @@ > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'acq_acqui-home', 'accounts', 'json' ) | $raw %]; > var oTable = $("#accounts").kohaTable({ >- "drawCallback": function ( oSettings ) { >+ drawCallback: function ( oSettings ) { > if ( oSettings.aiDisplay.length == 0 ) > { > return; >@@ -239,17 +239,17 @@ > } > } > }, >- "footerCallback": function ( row, data, start, end, display ) { >+ footerCallback: function ( row, data, start, end, display ) { > var api = this.api(), data; > footer_column_sum( api, [ 6, 7, 8, 9 ] ); > }, >- "columnDefs": [ >+ columnDefs: [ > { "orderable": false, "targets": ["_all"] } > ], >- "ordering": true, >- "orderFixed": [[ 1, 'asc' ]], >- "paginate": false, >- "autoWidth": false >+ ordering: true, >+ orderFixed: [[ 1, 'asc' ]], >+ paginate: false, >+ autoWidth: false > }, table_settings ); > let table_dt = oTable.DataTable(); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index 1c8d8a56a17..f191dac9d59 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -80,37 +80,37 @@ > let edi_msgs_table_url = '/api/v1/acquisitions/edifiles?'; > > var edi_msgs_table = $("#edi_msgs").kohaTable({ >- "ajax": { >+ ajax: { > "url": edi_msgs_table_url > }, >- "embed": [ >+ embed: [ > "vendor", > "basket", > "errors" > ], >- "order": [[ 1, "desc" ]], >- "columns": [ >+ order: [[ 1, "desc" ]], >+ columns: [ > { >- "data": "type", >- "title": _("Type"), >- "searchable": true, >- "orderable": true >+ data: "type", >+ title: _("Type"), >+ searchable: true, >+ orderable: true > }, > { >- "data": "transfer_date", >- "title": _("Transferred"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "transfer_date", >+ title: _("Transferred"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $date(row.transfer_date); > } > }, > { >- "data": "status", >- "title": _("Status"), >- "searchable": true, >- "orderable": true, >- "render": function(daya, type, row, meta) { >+ data: "status", >+ title: _("Status"), >+ searchable: true, >+ orderable: true, >+ render: function(daya, type, row, meta) { > let rendered = ''; > if ( row.errors.length > 0 ) { > let errorsList = '<ul>'; >@@ -133,11 +133,11 @@ > } > }, > { >- "data": "vendor.name", >- "title": _("Vendor"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "vendor.name", >+ title: _("Vendor"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > let link; > if ( row.vendor ) { > link = '<a href="/cgi-bin/koha/acquisition/vendors/'+row.vendor_id+'">'+row.vendor.name+'</a>'; >@@ -148,11 +148,11 @@ > } > }, > { >- "data": "basket_id:type", >- "title": _("Details"), >- "searchable": false, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "basket_id:type", >+ title: _("Details"), >+ searchable: false, >+ orderable: true, >+ render: function(data, type, row, meta) { > let rendered = ''; > if ( row.type == 'QUOTE' || row.type == 'ORDERS' ) { > if ( row.basket_id ) { >@@ -165,17 +165,17 @@ > } > }, > { >- "data": "filename", >- "title": _("Filename"), >- "searchable": true, >- "orderable": true >+ data: "filename", >+ title: _("Filename"), >+ searchable: true, >+ orderable: true > }, > { >- "title": _("Actions"), >- "className": "actions", >- "searchable": false, >- "orderable": false, >- "render": function(data, type, row, meta) { >+ title: _("Actions"), >+ className: "actions", >+ searchable: false, >+ orderable: false, >+ render: function(data, type, row, meta) { > var result = '<a class="btn btn-default btn-xs view_message" target="_blank" href="/cgi-bin/koha/acqui/edimsg.pl?id='+encodeURIComponent(row.id)+'"><i class="fa fa-search"></i> '+_("View message")+'</a> '; > result += '<form action="/cgi-bin/koha/acqui/edifactmsgs.pl" method="post"><input type="hidden" name="message_id" value="'+encodeURIComponent(row.id)+'" />'; > result += '<input type="hidden" name="csrf_token" value="' + $('meta[name="csrf-token"]').attr('content').trim() + '" />'; >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 446e5ce38d7..b714a2303de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -390,10 +390,10 @@ > > var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'lateorders', 'late_orders', 'json' ) | $raw %]; > late_orderst = $("#late_orders").kohaTable({ >- "sorting": [[ 1, "asc" ]], >- "pagingType": "full", >- "autoWidth": false, >- "drawCallback": function() { >+ order: [[ 1, "asc" ]], >+ pagingType: "full", >+ autoWidth: false, >+ drawCallback: function() { > if ( typeof late_orderst != 'undefined' ) { > check_uncheck(); > $('input:checkbox[name=ordernumber]').bind('click', check_uncheck); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index b36f1d39b92..b55b4ffdd43 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -552,28 +552,28 @@ > var base_query = { "order_id": {"-in": [[% multiple_orders | html %]]}}; > var pending_orders_url = "/api/v1/acquisitions/orders?only_active=1"; > var options = { >- "ajax": { >+ ajax: { > "url": pending_orders_url + "&q=" + encodeURI(JSON.stringify(base_query)) > }, >- "embed": [ >+ embed: [ > "basket", > "biblio.suggestions.suggester", > "fund.budget", > "items+strings", > "creator" > ], >- 'dom': 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >- "columns": [ >+ dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', >+ columns: [ > { >- "data": "order_id", >- "searchable": true, >- "orderable": true >+ data: "order_id", >+ searchable: true, >+ orderable: true > }, > { >- "data": "biblio.title", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "biblio.title", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > if ( data == null ) { > return ""; > } >@@ -583,10 +583,10 @@ > } > }, > { >- "data": "biblio.author", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "biblio.author", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > if ( data == null ) { > return ""; > } >@@ -596,10 +596,10 @@ > } > }, > { >- "data": "biblio.isbn", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "biblio.isbn", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > if ( data == null ) { > return ""; > } >@@ -609,39 +609,39 @@ > } > }, > { >- "searchable": false, >- "orderable": false, >- "data": function(row, type, val, meta) { >+ searchable: false, >+ orderable: false, >+ data: function(row, type, val, meta) { > return $date(row.date_received||new Date().toISOString()); > } > }, > { >- "data": "fund.name", >- "searchable": true, >- "orderable": false, >- "render": function(data, type, row, meta) { >+ data: "fund.name", >+ searchable: true, >+ orderable: false, >+ render: function(data, type, row, meta) { > return row.fund.budget.budget_period_description+" - "+row.fund.name; > } > }, > { >- "searchable": false, >- "orderable": true, >- "data": "quantity_received", >- "render": function(data, type, row, meta) { >+ searchable: false, >+ orderable: true, >+ data: "quantity_received", >+ render: function(data, type, row, meta) { > var data = $("#order_edit").data(); > return QTY_TOTAL.format(row.subscription_id&&(!data.saved||!data.saved.hasOwnProperty(row.order_id))?row.quantity:row.quantity_received, row.quantity); > } > }, > { >- "searchable": false, >- "orderable": false, >- "render": function(data, type, row, meta) { >+ searchable: false, >+ orderable: false, >+ render: function(data, type, row, meta) { > return '<a class="btn btn-default btn-xs order_edit_toggle" data-bs-toggle="modal" href="#order_edit" data-row="'+meta.row+'" role="button"><i class="fa fa-pencil" aria-hidden="true"></i> '+EDIT+'</a>'; > } > } > ], > [% IF only_one_order %] >- "drawCallback": function( settings ) { >+ drawCallback: function( settings ) { > $("#order_edit").modal("show"); > }, > [% END %] >@@ -1017,20 +1017,20 @@ > var base_query = { "subscription_id": row.subscription_id, "parent_order_id": row.order_id, "order_id": {"!=": row.order_id}}; > var pending_orders_url = "/api/v1/acquisitions/orders"; > var options = { >- "ajax": { >+ ajax: { > "url": pending_orders_url + "?q=" + encodeURI(JSON.stringify(base_query)) > }, >- "embed": [ >+ embed: [ > "invoice", > "basket" > ], >- "order": [[1, 'asc']], >- 'dom': 'C<"top pager"ilpfB>tr<"bottom pager"ip>', >- "columns": [ >+ order: [[1, 'asc']], >+ dom: 'C<"top pager"ilpfB>tr<"bottom pager"ip>', >+ columns: [ > { >- "searchable": false, >- "orderable": false, >- "data": function(row, type, val, meta) { >+ searchable: false, >+ orderable: false, >+ data: function(row, type, val, meta) { > if(row.invoice) { > if(CAN_user_acquisition) { > return '<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid='+row.invoice_id+'" title="Invoice detail page">'+row.invoice.invoice_number+"</a>"; >@@ -1040,53 +1040,53 @@ > } > }, > { >- "data": "order_id", >- "searchable": false, >- "orderable": false >+ data: "order_id", >+ searchable: false, >+ orderable: false > }, > { >- "searchable": false, >- "orderable": false, >- "data": "basket.creation_date", >- "render": function(data, type, row, meta) { >+ searchable: false, >+ orderable: false, >+ data: "basket.creation_date", >+ render: function(data, type, row, meta) { > return $date(row.basket.creation_date); > } > }, > { >- "searchable": false, >- "orderable": false, >- "data": function(row, type, val, meta) { >+ searchable: false, >+ orderable: false, >+ data: function(row, type, val, meta) { > return $date(row.date_received); > } > }, > { >- "searchable": false, >- "orderable": false, >- "data": function(row, type, val, meta) { >+ searchable: false, >+ orderable: false, >+ data: function(row, type, val, meta) { > return row.quantity_received; > } > }, > { >- "searchable": false, >- "orderable": true, >- "data": function(row, type, val, meta) { >+ searchable: false, >+ orderable: true, >+ data: function(row, type, val, meta) { > if(!row.status) return; > var first_letter = row.status[0].toUpperCase(); > return first_letter+row.status.substr(1).toLowerCase(); > } > }, > { >- "searchable": false, >- "orderable": false, >- "data": function(row, type, val, meta) { >+ searchable: false, >+ orderable: false, >+ data: function(row, type, val, meta) { > if(!row.date_received) return; > return Number(row.unit_price_tax_excluded * row.quantity_received).format_price()+' / '+Number(row.unit_price_tax_included * row.quantity_received).format_price() > } > }, > { >- "searchable": false, >- "orderable": false, >- "data": function(row, type, val, meta) { >+ searchable: false, >+ orderable: false, >+ data: function(row, type, val, meta) { > return row.internal_note; > } > } >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 4dfc2d6ddef..13b105663c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -396,10 +396,10 @@ > } > > var options = { >- "ajax": { >+ ajax: { > "url": '/api/v1/acquisitions/orders?only_active=1' > }, >- "embed": [ >+ embed: [ > "basket.basket_group", > "biblio.uncancelled_orders+count", > "biblio.holds+count", >@@ -409,18 +409,18 @@ > "current_item_level_holds+count", > "items" > ], >- "columns": [ >- { "data": "basket.name", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ columns: [ >+ { data: "basket.name", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > if (type != 'display') return escape_str(data); > return "<a href=\"/cgi-bin/koha/acqui/basket.pl?basketno=" + encodeURIComponent(row.basket.basket_id) + "\">" + escape_str(data) + " (" + escape_str(row.basket.basket_id) + ")</a>"; > } > }, >- { "data": "basket.basket_group.name", >- "orderable": true, >- "render": function(data, type, row, meta) { >+ { data: "basket.basket_group.name", >+ orderable: true, >+ render: function(data, type, row, meta) { > if ( type != 'display' ) { > return escape_str(data); > } >@@ -436,8 +436,8 @@ > } > }, > { >- "data": "order_id", >- "render": function(data, type, row, meta) { >+ data: "order_id", >+ render: function(data, type, row, meta) { > if (type != 'display') return escape_str(data); > return "<a href=\"neworderempty.pl?ordernumber="+encodeURIComponent(data)+"&booksellerid="+encodeURIComponent(row.basket.vendor_id)+"\">"+escape_str(data)+"</a>"; > } >@@ -445,8 +445,8 @@ > { > [% SET summary_fields = "biblio.title:biblio.author:biblio.isbn:biblio.publisher:me.internal_note:me.vendor_note" %] > [% IF Koha.Preference('marcflavour')=='UNIMARC' %][% SET summary_fields = summary_fields _ ":biblio.ean" %][% END %] >- "data": "[% summary_fields | html %]", >- "render": function(data, type, row, meta) { >+ data: "[% summary_fields | html %]", >+ render: function(data, type, row, meta) { > var result = ''; > if ( row && row.biblio_id != null ) { > result = "<p><a href=\"/cgi-bin/koha/catalogue/detail.pl?biblionumber="+encodeURIComponent(row.biblio_id)+"\">"+escape_str(row.biblio.title)+"</a>"; >@@ -520,11 +520,11 @@ > > return result; > }, >- "orderable": true, >+ orderable: true, > }, > { >- "data": "", >- "render": function(data, type, row, meta) { >+ data: "", >+ render: function(data, type, row, meta) { > var result = '<div class="btn-group dropup">'; > > result += '<button id="view' + row.order_id + '" type="button" class="btn btn-default btn-xs">' + _("View") + '</button>'; >@@ -538,55 +538,55 @@ > result += '</div>'; > return result; > }, >- "orderable": false, >- "searchable": false >+ orderable: false, >+ searchable: false > }, > { >- "data": "replacement_price", >- "render": function(data, type, row, meta) { >+ data: "replacement_price", >+ render: function(data, type, row, meta) { > return escape_price(row.replacement_price); > }, > }, > { >- "data": "quantity", >- "orderable": true >+ data: "quantity", >+ orderable: true > }, > { >- "data": "ecost", >- "render": function(data, type, row, meta) { >+ data: "ecost", >+ render: function(data, type, row, meta) { > return escape_price(row.ecost); > }, > }, > { >- "data": "", >- "render": function(data, type, row, meta) { >+ data: "", >+ render: function(data, type, row, meta) { > return escape_price(row.quantity * row.ecost); > }, >- "orderable": false, // FIXME: How can we do it in DBIC? >- "searchable": false >+ orderable: false, // FIXME: How can we do it in DBIC? >+ searchable: false > }, > { >- "data": "fund.name", >- "render": function(data, type, row, meta) { >+ data: "fund.name", >+ render: function(data, type, row, meta) { > if (type != 'display') return escape_str(data); > return escape_str(row.fund.name); > } > }, > { >- "data": "", >- "render": function(data, type, row, meta) { >+ data: "", >+ render: function(data, type, row, meta) { > return '<a href="orderreceive.pl?multiple_orders=' > + encodeURIComponent(row.order_id) + '&invoiceid=[% invoiceid | uri %]' + '">' > + _("Receive") + '</a><br/>' > + '<a href="#" onclick="transfer_order_popup(' + escape_str(row.order_id) + '); return false;">' > + _("Transfer") + '</a>'; > }, >- "orderable": false, >- "searchable": false >+ orderable: false, >+ searchable: false > }, > { >- "data": "", >- "render": function(data, type, row, meta) { >+ data: "", >+ render: function(data, type, row, meta) { > var result = ""; > > if ( row.current_holds_count > 0 ) { >@@ -644,8 +644,8 @@ > > return result; > }, >- "orderable": false, >- "searchable": false >+ orderable: false, >+ searchable: false > } > ] > }; >@@ -658,11 +658,11 @@ > }).html(PENDING_MULTI_SELECTION.format('0')) > options.order = [[1, 'asc']]; > options.columns.unshift({ >- "data": function (row, type, val, meta) { >+ data: function (row, type, val, meta) { > return '<input type="checkbox" class="selOrder" />'; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }); > > let table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'parcel', 'pending_orders', 'json' ) | $raw %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 08b89893a13..4170bf903ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -272,7 +272,7 @@ > <script> > $(document).ready(function () { > $("#parcelst").kohaTable({ >- paginate: false, >+ paging: false, > }); > > //keep a copy of all budgets before removing the inactives >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 4c7fdd2e715..a0fc1b86974 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -590,7 +590,7 @@ > [% IF closed %] > var oTable = $("#closed_report").kohaTable({ > // The following is a c/p from aqbudgets.tt and is a candidate for refactoring. >- "drawCallback": function ( oSettings ) { >+ drawCallback: function ( oSettings ) { > if ( oSettings.aiDisplay.length == 0 ) > { > return; >@@ -616,14 +616,14 @@ > } > } > }, >- "columnDefs": [ >- { "visible": false, "targets": [ 0, 1 ] }, >- { "orderable": false, "targets": ["_all"] } >+ columnDefs: [ >+ { visible: false, targets: [ 0, 1 ] }, >+ { orderable: false, targets: ["_all"] } > ], >- "ordering": true, >- "orderFixed": [[ 1, 'asc' ]], >- "autoWidth": false, >- "pagingType": "full_numbers" >+ ordering: true, >+ orderFixed: [[ 1, 'asc' ]], >+ autoWidth: false, >+ pagingType: "full_numbers" > }); > [% END %] > $("#add_modify_budget").validate({ >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 995ee148811..c5dee394adb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -681,7 +681,7 @@ > $(document).ready(function() { > [% IF budgets %] > var oTable = $("#budgeth").kohaTable({ >- "drawCallback": function ( oSettings ) { >+ drawCallback: function ( oSettings ) { > if ( oSettings.aiDisplay.length == 0 ) > { > return; >@@ -707,18 +707,18 @@ > } > } > }, >- "footerCallback": function ( row, data, start, end, display ) { >+ footerCallback: function ( row, data, start, end, display ) { > var api = this.api(), data; > footer_column_sum( api, [ 4, 6, 8, 10 ], 2 ); > }, >- "columnDefs": [ >- { "visible": false, "targets": [ 0, 1 ] }, >- { "orderable": false, "targets": ["_all"] } >+ columnDefs: [ >+ { visible: false, targets: [ 0, 1 ] }, >+ { orderable: false, targets: ["_all"] } > ], >- "ordering": true, >- "orderFixed": [[ 1, 'asc' ]], >- "paginate": false, >- "autoWidth": false >+ ordering: true, >+ orderFixed: [[ 1, 'asc' ]], >+ paging: false, >+ autoWidth: false > }); > let table_dt = oTable.DataTable(); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index 5e6633bcdd7..6fcf9e91ed0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -438,7 +438,6 @@ > <script> > $(document).ready(function() { > $("#table_authsubfieldstructure").kohaTable({ >- aaSorting: [], > paging: false, > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >index a6d78befa9a..63cd9ba8b8d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt >@@ -258,74 +258,74 @@ > } > > let jobs_table = $("#table_jobs").kohaTable({ >- "ajax": { >+ ajax: { > "url": "/api/v1/jobs?" + only_current_filter() > }, >- "order": [[ 4, "desc" ]], >- "columns": [ >+ order: [[ 4, "desc" ]], >+ columns: [ > { >- "data": "job_id", >- "searchable": true, >- "orderable": true >+ data: "job_id", >+ searchable: true, >+ orderable: true > }, > { >- "data": "status", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "status", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return get_job_status(row.status).escapeHtml(); > } > }, > { >- "data": "progress,size", >- "searchable": false, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "progress,size", >+ searchable: false, >+ orderable: true, >+ render: function(data, type, row, meta) { > return "%s/%s".format(row.progress, row.size).escapeHtml(); > } > }, > { >- "data": "type", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "type", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return get_job_type(row.type); > } > }, > { >- "data": "enqueued_date", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "enqueued_date", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $datetime(row.enqueued_date); > } > }, > { >- "data": "started_date", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "started_date", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $datetime(row.started_date); > } > }, > { >- "data": "ended_date", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "ended_date", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $datetime(row.ended_date); > } > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > var result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id='+ encodeURIComponent(row.job_id) +'"><i class="fa-solid fa-eye aria-hidden="true"></i> '+_("View")+'</a>'+"\n"; > if ( row.status == 'new' || row.status == 'started' ) { > result += '<a class="btn btn-default btn-xs submit-form-link" role="button" href="#" data-action="/cgi-bin/koha/admin/background_jobs.pl" data-method="post" data-op="cud-cancel" data-confirmation-msg="[% t('Are you sure you want to cancel this job?') | html %]" data-id="'+ encodeURIComponent(row.job_id) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Cancel")+'</a>'; > } > return result; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > } > ] > }, null, 1); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 4098f59c3d4..ddbb9b94c64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -811,14 +811,14 @@ > > var libraries_url = '/api/v1/libraries'; > libraries_table = $("#libraries").kohaTable({ >- "ajax": { >+ ajax: { > "url": libraries_url > }, >- 'embed': [ 'smtp_server', 'library_hours' ], >- 'emptyTable': '<div class="alert alert-info">'+_("There are no libraries defined.")+' <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">'+_("Start defining libraries")+'</a>.</div>', >- "columnDefs": [ { >- "targets": [1,3,4,5,6], >- "render": function (data, type, row, meta) { >+ embed: [ 'smtp_server', 'library_hours' ], >+ emptyTable: '<div class="alert alert-info">'+_("There are no libraries defined.")+' <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">'+_("Start defining libraries")+'</a>.</div>', >+ columnDefs: [ { >+ targets: [1,3,4,5,6], >+ render: function (data, type, row, meta) { > if ( type == 'display' ) { > if ( data != null ) { > return data.escapeHtml(); >@@ -830,22 +830,22 @@ > return data; > } > } ], >- "columns": [ >+ columns: [ > { >- "data": "name", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "name", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return "<a href=\"/cgi-bin/koha/admin/branches.pl?op=view&branchcode=" + encodeURIComponent( row.library_id ) + "\">" + row.name.escapeHtml() + "</a>"; > } > }, > { >- "data": "library_id", >- "searchable": true, >- "orderable": true >+ data: "library_id", >+ searchable: true, >+ orderable: true > }, > { >- "render": function( data, type, row, meta ) { >+ render: function( data, type, row, meta ) { > const library_info = []; > if ( row.address1 != null ) library_info.push(row.address1.escapeHtml()); > if ( row.address2 != null ) library_info.push(row.address2.escapeHtml()); >@@ -869,38 +869,38 @@ > if ( row.notes != null ) library_info.push(_("Notes")+': '+row.notes.escapeHtml()); > return library_info.join('<br/>'); > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > { >- "data": "marc_org_code", >- "searchable": true, >- "orderable": true >+ data: "marc_org_code", >+ searchable: true, >+ orderable: true > }, > { >- "data": "ip", >- "searchable": true, >- "orderable": true >+ data: "ip", >+ searchable: true, >+ orderable: true > }, > { >- "data": "pickup_location", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "pickup_location", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return (data) ? _("Yes") : _("No"); > } > }, > { >- "data": "public", >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "public", >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return (data) ? _("Yes") : _("No"); > } > }, > { >- "data": "smtp_server", >- "render": function( data, type, row, meta ) { >+ data: "smtp_server", >+ render: function( data, type, row, meta ) { > if ( data.smtp_server_id ) { > return '<a href="/cgi-bin/koha/admin/smtp_servers.pl?op=edit_form&smtp_server_id='+encodeURIComponent(data.smtp_server_id)+'">'+data.name.escapeHtml()+'</a>'; > } >@@ -908,12 +908,12 @@ > return _("Default").escapeHtml(); > } > }, >- "searchable": false, >- "visible": true, >- "orderable": false >+ searchable: false, >+ visible: true, >+ orderable: false > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > let result = ''; > let set_hours = 0; > if ( row.library_hours.length > 0 ) { >@@ -947,11 +947,11 @@ > } > return result; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > > var result = '<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode='+encodeURIComponent(row.library_id)+'" role="button"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'; > result += '<form action="/cgi-bin/koha/admin/branches.pl" method="get">'; >@@ -962,8 +962,8 @@ > return result; > > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > ] > }, table_settings); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 4c1a2790d6b..18267ea53b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -219,13 +219,13 @@ > [% END %] > > var cities_table = $("#table_cities").kohaTable({ >- "ajax": { >+ ajax: { > "url": cities_table_url > }, >- "order": [[ 1, "asc" ]], >- "columnDefs": [ { >- "targets": [0,1,2,3,4], >- "render": function (data, type, row, meta) { >+ order: [[ 1, "asc" ]], >+ columnDefs: [ { >+ targets: [0,1,2,3,4], >+ render: function (data, type, row, meta) { > if ( type == 'display' ) { > if ( data != null ) { > return data.escapeHtml(); >@@ -236,42 +236,42 @@ > return data; > } > } ], >- "columns": [ >+ columns: [ > { >- "data": "city_id", >- "searchable": true, >- "orderable": true >+ data: "city_id", >+ searchable: true, >+ orderable: true > }, > { >- "data": "name", >- "searchable": true, >- "orderable": true >+ data: "name", >+ searchable: true, >+ orderable: true > }, > { >- "data": "state", >- "searchable": true, >- "orderable": true >+ data: "state", >+ searchable: true, >+ orderable: true > }, > { >- "data": "postal_code", >- "searchable": true, >- "orderable": true >+ data: "postal_code", >+ searchable: true, >+ orderable: true > }, > { >- "data": "country", >- "searchable": true, >- "orderable": true >+ data: "country", >+ searchable: true, >+ orderable: true > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > > var result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/cities.pl?op=add_form&cityid='+ encodeURIComponent(row.city_id) +'"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n"; > result += '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/cities.pl?op=delete_confirm&cityid='+ encodeURIComponent(row.city_id) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>'; > return result; > > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > } > ] > }, table_settings, 1); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt >index 84d64a37320..b3396789d51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt >@@ -343,15 +343,15 @@ > [% END %] > }; > window.identity_provider_domains = $("#identity_provider_domains").kohaTable({ >- "ajax": { >+ ajax: { > "url": identity_provider_domains_url > }, >- 'language': { >- 'emptyTable': '<div class="alert alert-info">'+_("There are no identity provider domains defined.")+'</div>' >+ language: { >+ emptyTable: '<div class="alert alert-info">'+_("There are no identity provider domains defined.")+'</div>' > }, >- "columnDefs": [ { >- "targets": [1], >- "render": function (data, type, row, meta) { >+ columnDefs: [ { >+ targets: [1], >+ render: function (data, type, row, meta) { > if ( type == 'display' ) { > if ( data != null ) { > return data.escapeHtml(); >@@ -363,12 +363,12 @@ > return data; > } > } ], >- "columns": [ >+ columns: [ > { >- "data": "domain", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "domain", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > if ( data != null ) { > return data.escapeHtml(); > } >@@ -378,71 +378,71 @@ > } > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > if (row.update_on_auth) { > return _("Yes"); > } else { > return _("No"); > } > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > if (row.auto_register) { > return _("Yes"); > } else { > return _("No"); > } > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > return libraries[row.default_library_id] || ""; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > return categories[row.default_category_id] || ""; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > if (row.allow_opac) { > return _("Yes"); > } else { > return _("No"); > } > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > if (row.allow_staff) { > return _("Yes"); > } else { > return _("No"); > } > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > var result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&identity_provider_id=[%- identity_provider_id | html -%]&op=edit_form&identity_provider_domain_id='+ encodeURIComponent(row.identity_provider_domain_id) +'"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n"; > result += '<a class="btn btn-default btn-xs delete_identity_provider_domain" role="button" href="#" data-bs-toggle="modal" data-bs-target="#delete_confirm_modal" data-auth-provider-domain-id="'+ encodeURIComponent(row.identity_provider_domain_id) +'" data-auth-provider-domain="'+ encodeURIComponent((row.domain || '').escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>'; > return result; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > } > ], > createdRow: function (row, data, dataIndex) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >index afd9a028d82..9771d937379 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt >@@ -394,20 +394,20 @@ > } > > $('#marc-overlay-rules').kohaTable({ >- "columns": [ >- {"searchable": false, "orderable": false}, >+ columns: [ >+ {searchable: false, orderable: false}, > {"orderDataType": "dom-input"}, > {"orderDataType": "dom-input"}, >- {"searchable": false, "orderDataType": "dom-input"}, >- {"searchable": false, "orderDataType": "dom-input"}, >- {"searchable": false, "orderDataType": "dom-input"}, >- {"searchable": false, "orderDataType": "dom-input"}, >- {"searchable": false, "orderDataType": "dom-input"}, >- {"searchable": false, "orderDataType": "dom-input"}, >- {"searchable": false, "orderable": false}, >- {"searchable": false, "orderable": false} >+ {searchable: false, "orderDataType": "dom-input"}, >+ {searchable: false, "orderDataType": "dom-input"}, >+ {searchable: false, "orderDataType": "dom-input"}, >+ {searchable: false, "orderDataType": "dom-input"}, >+ {searchable: false, "orderDataType": "dom-input"}, >+ {searchable: false, "orderDataType": "dom-input"}, >+ {searchable: false, orderable: false}, >+ {searchable: false, orderable: false} > ], >- "pagingType": "simple" >+ pagingType: "simple" > }); > > var overlay_rules_presets = {}; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >index 9e6e742f92b..607a3e87b6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt >@@ -324,15 +324,15 @@ > > var smtp_servers_url = '/api/v1/config/smtp_servers'; > window.smtp_servers = $("#smtp_servers").kohaTable({ >- "ajax": { >+ ajax: { > "url": smtp_servers_url > }, > 'language': { >- 'emptyTable': '<div class="alert alert-info">'+_("There are no SMTP servers defined.")+'</div>' >+ emptyTable: '<div class="alert alert-info">'+_("There are no SMTP servers defined.")+'</div>' > }, >- "columnDefs": [ { >- "targets": [0,1], >- "render": function (data, type, row, meta) { >+ columnDefs: [ { >+ targets: [0,1], >+ render: function (data, type, row, meta) { > if ( type == 'display' ) { > if ( data != null ) { > return data.escapeHtml(); >@@ -344,30 +344,30 @@ > return data; > } > } ], >- "columns": [ >+ columns: [ > { >- "data": "name", >- "searchable": true, >- "orderable": true >+ data: "name", >+ searchable: true, >+ orderable: true > }, > { >- "data": "host", >- "searchable": true, >- "orderable": true >+ data: "host", >+ searchable: true, >+ orderable: true > }, > { >- "data": "port", >- "searchable": true, >- "orderable": false >+ data: "port", >+ searchable: true, >+ orderable: false > }, > { >- "data": "timeout", >- "searchable": true, >- "orderable": false >+ data: "timeout", >+ searchable: true, >+ orderable: false > }, > { >- "data": "ssl_mode", >- "render": function (data, type, row, meta) { >+ data: "ssl_mode", >+ render: function (data, type, row, meta) { > if (data == 'disabled') { > return _("Disabled"); > } >@@ -378,11 +378,11 @@ > return _("STARTTLS"); > } > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > if ( row.user_name != null ) { > return _("Yes"); > } >@@ -390,11 +390,11 @@ > return _("No"); > } > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > if ( row.debug ) { > let result = '<span class="badge text-bg-warning">' + "[% tp("Active", "On") | html %]" + '</span>'; > return result; >@@ -403,11 +403,11 @@ > return _(""); > } > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > if ( row.is_default ) { > let result = '<span class="badge text-bg-success">' + _("Default") + '</span>'; > return result; >@@ -415,17 +415,17 @@ > return ""; > } > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > var result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/smtp_servers.pl?op=edit_form&smtp_server_id='+ encodeURIComponent(row.smtp_server_id) +'"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n"; > result += '<a class="btn btn-default btn-xs delete_server" role="button" href="#" data-bs-toggle="modal" data-bs-target="#delete_confirm_modal" data-smtp-server-id="'+ encodeURIComponent(row.smtp_server_id) +'" data-smtp-server-name="'+ encodeURIComponent(row.name.escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>'; > return result; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > } > ], > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt >index f9e4c193785..f97bfe46898 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt >@@ -240,18 +240,18 @@ > > var bookings_table_url = "/api/v1/biblios/%s/bookings".format(biblionumber); > bookings_table = $('#bookings_table').kohaTable({ >- "ajax": { >+ ajax: { > "url": bookings_table_url > }, >- "embed": [ >+ embed: [ > "item", > "patron", > "pickup_library" > ], >- "columns": [{ >- "data": "booking_id", >- "title": _("Booking ID"), >- "visible": false >+ columns: [{ >+ data: "booking_id", >+ title: _("Booking ID"), >+ visible: false > }, > { > data: "", >@@ -314,12 +314,12 @@ > } > }, > { >- "data": "item.external_id", >- "title": _("Item"), >- "searchable": true, >- "orderable": true, >- "defaultContent": _("Any item"), >- "render": function(data,type,row,meta) { >+ data: "item.external_id", >+ title: _("Item"), >+ searchable: true, >+ orderable: true, >+ defaultContent: _("Any item"), >+ render: function(data,type,row,meta) { > if ( row.item ) { > return row.item.external_id + " (" + row.booking_id + ")"; > } else { >@@ -328,11 +328,11 @@ > } > }, > { >- "data": "patron.firstname:patron.surname", >- "title": _("Patron"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "patron.firstname:patron.surname", >+ title: _("Patron"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $patron_to_html(row.patron, { > display_cardnumber: true, > url: true >@@ -340,39 +340,39 @@ > } > }, > { >- "data": "pickup_library.name", >- "title": _("Pickup library"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "pickup_library.name", >+ title: _("Pickup library"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return row.pickup_library.name; > } > }, > { >- "data": "start_date", >- "title": _("Start date"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "start_date", >+ title: _("Start date"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $date(row.start_date); > } > }, > { >- "data": "end_date", >- "title": _("End date"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "end_date", >+ title: _("End date"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $date(row.end_date); > } > }, > { >- "data": "", >- "title": _("Actions"), >- "class": "actions", >- "searchable": false, >- "orderable": false, >- "render": function(data, type, row, meta) { >+ data: "", >+ title: _("Actions"), >+ class:"actions", >+ searchable: false, >+ orderable: false, >+ render: function(data, type, row, meta) { > let result = ""; > let is_cancelled = row.status === "cancelled"; > [% IF CAN_user_circulate_manage_bookings %] >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 0fc818512a5..10a4a5d3329 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1297,10 +1297,10 @@ > > var tickets_url = '/api/v1/tickets'; > var tickets = $("#table_concerns").kohaTable({ >- "ajax": { >+ ajax: { > "url": tickets_url > }, >- "embed": [ >+ embed: [ > "assignee", > "reporter", > "resolver", >@@ -1308,10 +1308,10 @@ > "updates+count", > "+strings" > ], >- 'emptyTable': '<div class="alert alert-info">' + _("Congratulations, there are no catalog concerns.") + '</div>', >- "columnDefs": [ { >- "targets": [0,1,2,3], >- "render": function (data, type, row, meta) { >+ emptyTable: '<div class="alert alert-info">' + _("Congratulations, there are no catalog concerns.") + '</div>', >+ columnDefs: [ { >+ targets: [0,1,2,3], >+ render: function (data, type, row, meta) { > if ( type == 'display' ) { > if ( data != null ) { > return data.escapeHtml(); >@@ -1323,10 +1323,10 @@ > return data; > } > } ], >- "columns": [ >+ columns: [ > { >- "data": "reported_date:reporter.firstname", >- "render": function(data, type, row, meta) { >+ data: "reported_date:reporter.firstname", >+ render: function(data, type, row, meta) { > let reported = '<div class="d-flex justify-content-between align-items-start">'; > reported += '<span class="reporter">' + $patron_to_html(row.reporter, { > display_cardnumber: false, >@@ -1336,12 +1336,12 @@ > reported += '</div>'; > return reported; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": "title:body", >- "render": function(data, type, row, meta) { >+ data: "title:body", >+ render: function(data, type, row, meta) { > let result = '<div class="d-flex justify-content-between align-items-start">'; > > // Title link on the left >@@ -1358,22 +1358,22 @@ > > return result; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": "biblio.title", >- "render": function(data, type, row, meta) { >+ data: "biblio.title", >+ render: function(data, type, row, meta) { > return $biblio_to_html(row.biblio, { > link: 1 > }); > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": "assignee.firstname:assignee.surname:resolver.firstname:resolver.surname:resolved_date:status", >- "render": function(data, type, row, meta) { >+ data: "assignee.firstname:assignee.surname:resolver.firstname:resolver.surname:resolved_date:status", >+ render: function(data, type, row, meta) { > let result = ''; > if (row.resolved_date) { > result += "<div>"; >@@ -1408,17 +1408,17 @@ > } > return result; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function(row, type, val, meta) { >+ data: function(row, type, val, meta) { > let resolved = ( row.resolved_date ) ? true : false; > let result = '<a class="btn btn-default btn-xs main-trigger" role="button" href="#" data-bs-toggle="modal" data-bs-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="' + resolved + '" data-assignee="'+$patron_to_html(row.assignee, { display_cardnumber: false, url: false })+'"><i class="fa-solid fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>'; > return result; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > ] > }, table_settings, 0, additional_filters, undefined, external_filter_nodes); >@@ -1790,63 +1790,63 @@ > // Initialise as a DataTable > var bundle_table_url = "/api/v1/items/" + itemnumber + "/bundled_items?"; > var bundle_table = bundles_table.kohaTable({ >- "ajax": { >+ ajax: { > "url": bundle_table_url > }, >- "embed": [ >+ embed: [ > "biblio", > "return_claim.patron" > ], >- "order": [[ 1, "asc" ]], >- "columnDefs": [ { >- "targets": [0,1,2,3], >- "render": function (data, type, row, meta) { >+ order: [[ 1, "asc" ]], >+ columnDefs: [ { >+ targets: [0,1,2,3], >+ render: function (data, type, row, meta) { > if ( data && type == 'display' ) { > return data.escapeHtml(); > } > return data; > } > } ], >- "columns": [ >+ columns: [ > { >- "data": "biblio.title:biblio.subtitle:biblio.medium", >- "title": _("Title"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "biblio.title:biblio.subtitle:biblio.medium", >+ title: _("Title"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $biblio_to_html(row.biblio, { link: 1 }); > } > }, > { >- "data": "biblio.author", >- "title": _("Author"), >- "searchable": true, >- "orderable": true, >+ data: "biblio.author", >+ title: _("Author"), >+ searchable: true, >+ orderable: true, > }, > { >- "data": "copy_number", >- "title": _("Copy number"), >- "searchable": true, >- "orderable": true, >+ data: "copy_number", >+ title: _("Copy number"), >+ searchable: true, >+ orderable: true, > }, > { >- "data": "callnumber", >- "title": _("Callnumber"), >- "searchable": true, >- "orderable": true, >+ data: "callnumber", >+ title: _("Callnumber"), >+ searchable: true, >+ orderable: true, > }, > { >- "data": "external_id", >- "title": _("Barcode"), >- "searchable": true, >- "orderable": true, >+ data: "external_id", >+ title: _("Barcode"), >+ searchable: true, >+ orderable: true, > }, > { >- "data": "lost_status:last_seen_date:return_claim.patron", >- "title": _("Status"), >- "searchable": false, >- "orderable": false, >- "render": function(data, type, row, meta) { >+ data: "lost_status:last_seen_date:return_claim.patron", >+ title: _("Status"), >+ searchable: false, >+ orderable: false, >+ render: function(data, type, row, meta) { > if ( row.lost_status == bundle_lost_value ) { > let out = '<span class="lost">' + _("Last seen") + ': ' + $date(row.last_seen_date) + '</span>'; > if ( row.return_claim ) { >@@ -1861,7 +1861,7 @@ > } > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > var result; > if (duedate) { > result = '<button class="btn btn-default btn-xs remove disabled" role="button" data-itemnumber="'+row.item_id+'" title="%s"><i class="fa fa-minus" aria-hidden="true"></i> %s</button>\n'.format(_("This bundle is checked out, it cannot be modified"), _("Remove")); >@@ -1870,10 +1870,10 @@ > } > return result; > }, >- "title": _("Actions"), >- "searchable": false, >- "orderable": false, >- "class": "no-export" >+ title: _("Actions"), >+ searchable: false, >+ orderable: false, >+ class:"no-export" > } > ] > }, bundle_settings, 1); >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 cbfdfa733c4..12a2817e844 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -644,11 +644,11 @@ > > var table_settings = [% TablesSettings.GetTableSettings( 'catalogue', 'itemsearch', 'results', 'json' ) | $raw %]; > $('#results').kohaTable( { >- "bKohaColumnsUseNames": true, >- "destroy": true, >- "serverSide": true, >- "processing": true, >- "ajax": { >+ bKohaColumnsUseNames: true, >+ destroy: true, >+ serverSide: true, >+ processing: true, >+ ajax: { > url: '/cgi-bin/koha/catalogue/itemsearch.pl', > data: function ( d ) { > for (i in params) { >@@ -664,9 +664,9 @@ > } > }, > bKohaAjaxSVC: true, >- 'dom': 'C<"top pager"ilpB>tr<"bottom pager"ip>', >- 'order': [[1, 'asc']], >- 'columns': [ >+ dom: 'C<"top pager"ilpB>tr<"bottom pager"ip>', >+ order: [[1, 'asc']], >+ columns: [ > { 'name': 'checkbox', 'orderable': false, searchable: false, }, > { 'name': 'title' }, > { 'name': 'publicationyear' }, >@@ -690,8 +690,8 @@ > { 'name': 'date_due' }, > { 'name': 'actions', 'orderable': false, searchable: false, } > ], >- "pagingType": "full_numbers", >- "drawCallback": function( settings ) { >+ pagingType: "full_numbers", >+ drawCallback: function( settings ) { > prepSelections(); > }, > fixedHeader: false // There is a bug on this view >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >index cad5cc9c141..4eb8c2ee1df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >@@ -87,10 +87,10 @@ > > var tickets_url = '/api/v1/tickets'; > var tickets = $("#table_concerns").kohaTable({ >- "ajax": { >+ ajax: { > "url": tickets_url > }, >- "embed": [ >+ embed: [ > "assignee", > "reporter", > "resolver", >@@ -98,10 +98,10 @@ > "updates+count", > "+strings" > ], >- 'emptyTable': '<div class="alert alert-info">' + _("Congratulations, there are no catalog concerns.") + '</div>', >- "columnDefs": [{ >- "targets": [0, 1, 2, 3], >- "render": function(data, type, row, meta) { >+ emptyTable: '<div class="alert alert-info">' + _("Congratulations, there are no catalog concerns.") + '</div>', >+ columnDefs: [{ >+ targets: [0, 1, 2, 3], >+ render: function(data, type, row, meta) { > if (type == 'display') { > if (data != null) { > return data.escapeHtml(); >@@ -112,9 +112,9 @@ > return data; > } > }], >- "columns": [{ >- "data": "reported_date:reporter.firstname", >- "render": function(data, type, row, meta) { >+ columns: [{ >+ data: "reported_date:reporter.firstname", >+ render: function(data, type, row, meta) { > let reported = '<div class="d-flex justify-content-between align-items-start">'; > reported += '<span class="reporter">' + $patron_to_html(row.reporter, { > display_cardnumber: false, >@@ -124,12 +124,12 @@ > reported += '</div>'; > return reported; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": "title:body", >- "render": function(data, type, row, meta) { >+ data: "title:body", >+ render: function(data, type, row, meta) { > let result = '<div class="d-flex justify-content-between align-items-start">'; > > // Title link on the left >@@ -146,22 +146,22 @@ > > return result; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": "biblio.title", >- "render": function(data, type, row, meta) { >+ data: "biblio.title", >+ render: function(data, type, row, meta) { > return $biblio_to_html(row.biblio, { > link: 1 > }); > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": "assignee.firstname:assignee.surname:resolver.firstname:resolver.surname:resolved_date:status", >- "render": function(data, type, row, meta) { >+ data: "assignee.firstname:assignee.surname:resolver.firstname:resolver.surname:resolved_date:status", >+ render: function(data, type, row, meta) { > let result = ''; > if (row.resolved_date) { > result += "<div>"; >@@ -196,17 +196,17 @@ > } > return result; > }, >- "searchable": true, >- "orderable": true >+ searchable: true, >+ orderable: true > }, > { >- "data": function(row, type, val, meta) { >+ data: function(row, type, val, meta) { > let resolved = ( row.resolved_date ) ? true : false; > let result = '<a class="btn btn-default btn-xs main-trigger" role="button" href="#" data-bs-toggle="modal" data-bs-target="#ticketDetailsModal" data-concern="' + encodeURIComponent(row.ticket_id) + '" data-resolved="'+resolved+'" data-assignee="'+$patron_to_html(row.assignee, { display_cardnumber: false, url: false })+'"><i class="fa-solid fa-eye" aria-hidden="true"></i> ' + _("Details") + '</a>'; > return result; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > }, > ], > createdRow: function (row, data, dataIndex) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index 94fe4f8edb2..cbc90c3ab09 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -361,8 +361,7 @@ > } > $("#checkout_infos").kohaTable({ > dom: "t", >- order: [], >- paging: false, >+ paging: false, > }); > }); > // On-site batch checkout >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >index e6503096cc4..afa5242d64e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >@@ -640,7 +640,7 @@ > let dt_tables = new Array("to_be_stagedt", "staged_and_readyt", "patron_is_outsidet", "delivered_todayt"); > dt_tables.forEach(function( id, index ){ > $("#" + id).kohaTable({ >- "autoWidth": false >+ autoWidth: false > }, dt_settings[ index ] ); > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt >index 12373098013..b46d0af1f5b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingbookings.tt >@@ -166,49 +166,49 @@ > > var bookings_table_url = '/api/v1/bookings?'; > var bookings_table = $("#bookingst").kohaTable({ >- "ajax": { >- "url": bookings_table_url >+ ajax: { >+ url: bookings_table_url > }, >- "embed": [ >+ embed: [ > "biblio", > "item+strings", > "item.checkout", > "patron", > "pickup_library" > ], >- "order": [[ 7, "asc" ]], >- "columns": [{ >- "data": "booking_id", >- "title": _("Booking ID"), >- "visible": false >+ order: [[ 7, "asc" ]], >+ columns: [{ >+ data: "booking_id", >+ title: _("Booking ID"), >+ visible: false > }, > { >- "data": "pickup_library.name:me.pickup_library_id", >- "title": _("Pickup library"), >- "searchable": true, >- "orderable": true, >- "render": function( data, type, row, meta ) { >+ data: "pickup_library.name:me.pickup_library_id", >+ title: _("Pickup library"), >+ searchable: true, >+ orderable: true, >+ render: function( data, type, row, meta ) { > return escape_str(row.pickup_library_id ? row.pickup_library.name : row.pickup_library_id); > } > }, > { >- "data": "biblio.title", >- "title": _("Title"), >- "searchable": true, >- "orderable": true, >- "render": function(data,type,row,meta) { >+ data: "biblio.title", >+ title: _("Title"), >+ searchable: true, >+ orderable: true, >+ render: function(data,type,row,meta) { > return $biblio_to_html(row.biblio, { > link: 'bookings' > }); > } > }, > { >- "data": "item.external_id", >- "title": _("Item"), >- "searchable": true, >- "orderable": true, >- "defaultContent": _("Any item"), >- "render": function(data,type,row,meta) { >+ data: "item.external_id", >+ title: _("Item"), >+ searchable: true, >+ orderable: true, >+ defaultContent: _("Any item"), >+ render: function(data,type,row,meta) { > if ( row.item ) { > return row.item.external_id + " (" + row.booking_id + ")"; > } else { >@@ -217,11 +217,11 @@ > } > }, > { >- "data": "item.callnumber", >- "title": _("Callnumber"), >- "searchable": true, >- "orderable": true, >- "render": function(data,type,row,meta) { >+ data: "item.callnumber", >+ title: _("Callnumber"), >+ searchable: true, >+ orderable: true, >+ render: function(data,type,row,meta) { > if ( row.item ) { > return row.item.callnumber; > } else { >@@ -230,11 +230,11 @@ > } > }, > { >- "data": "item.location", >- "title": _("Location"), >- "searchable": false, >- "orderable": false, >- "render": function(data,type,row,meta) { >+ data: "item.location", >+ title: _("Location"), >+ searchable: false, >+ orderable: false, >+ render: function(data,type,row,meta) { > if ( row.item ) { > if ( row.item.checked_out_date ) { > return _("On loan, due: ") + $date(row.item.checked_out_date); >@@ -247,11 +247,11 @@ > } > }, > { >- "data": "patron.firstname:patron.surname", >- "title": _("Patron"), >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "patron.firstname:patron.surname", >+ title: _("Patron"), >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $patron_to_html(row.patron, { > display_cardnumber: true, > url: true >@@ -259,13 +259,13 @@ > } > }, > { >- "data": "start_date", >- "name": "start_date", >- "title": _("Booking dates"), >- "type": "date", >- "searchable": false, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "start_date", >+ name: "start_date", >+ title: _("Booking dates"), >+ type: "date", >+ searchable: false, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $date(row.start_date) + ' - ' + $date(row.end_date); > } > }] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >index d649297524c..c3caa6c5271 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt >@@ -60,7 +60,7 @@ > [% END %] > <script> > var clubs_dt_params = { >- paginate: true, >+ paging: true, > }; > $("#table_clubnoenrollmemnts").kohaTable(clubs_dt_params); > $("#table_clubenrollments").kohaTable(clubs_dt_params); >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 274b07b6437..6dab9302f82 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -74,7 +74,6 @@ > $(document).ready(function () { > $("#pending_updates table").kohaTable({ > paging: false, >- info: true, > searching: true, > order: [[2, "asc"]], > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index 7f8b2d63318..0a3dc23f87a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -173,7 +173,7 @@ > $("#patron-lists-table").kohaTable({ > autoWidth: false, > pagingType: "full", >- "sorting": [[ 1, "asc" ]] >+ order: [[ 1, "asc" ]] > }); > > $(".delete_patron").on("click", function(){ >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 a1eca52972b..d4da08b8db5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt >@@ -336,37 +336,36 @@ > $(document).ready(function() { > const sale_table = document.getElementById('sale'); > const sale_kohaTable = $("#sale").kohaTable({ >- "paginate": false, >- "searching": false, >- "info": false, >- "columnDefs": [{ >+ paginate: false, >+ searching: false, >+ info: false, >+ columnDefs: [{ > "targets": [-2], > "orderable": false, > "searchable": false, > }, { >- "targets": [-3], >- "render": function ( data, type, full ) { >+ targets: [-3], >+ render: function ( data, type, full ) { > var price = Number.parseFloat(data); > return price.format_price(); > } > }, { >- "targets": [-5], >- "className": "editable", >+ targets: [-5], >+ className: "editable", > }, { >- "targets": [-4], >- "className": "editable_int", >+ targets: [-4], >+ className: "editable_int", > }, { >- "targets": [-1], >- "visible": false, >- "searchable": false >+ targets: [-1], >+ visible: false, >+ searchable: false > }], >- "order": [], >- "rowCallback": function( row, data ) { >+ rowCallback: function( row, data ) { > const total = data[1] * data[2]; > data[3] = total; > sale_kohaTable.api().cell(row, 3).invalidate(); > }, >- "footerCallback": function(tfoot, data, start, end, display) { >+ footerCallback: function(tfoot, data, start, end, display) { > let total_price = 0; > > // Loop through the data to calculate the total >@@ -383,7 +382,7 @@ > // Update a related element and trigger change > $('#paid').val(total_price).trigger('change'); > }, >- "autoWidth": false >+ autoWidth: false > }); > > $("#sale").on("click", "button.drop", function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >index 7e70e2c62d7..6a0e99c2e9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt >@@ -516,27 +516,27 @@ > > var cashups_table_url = "/api/v1/cash_registers/[% register.id | html %]/cashups?"; > var cashups_table = $("#table_cashups").kohaTable({ >- "ajax": { >+ ajax: { > "url": cashups_table_url > }, >- "embed": [ >+ embed: [ > "manager" > ], >- "order": [[ 0, "desc" ]], >- "columns": [ >+ order: [[ 0, "desc" ]], >+ columns: [ > { >- "data": "timestamp", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "timestamp", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > return $datetime(row.timestamp); > } > }, > { >- "data": "manager.firstname:manager.surname", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "manager.firstname:manager.surname", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > var fullname; > if ( row.manager.firstname == null ) { > fullname = row.manager.surname; >@@ -548,21 +548,21 @@ > } > }, > { >- "data": "amount", >- "searchable": true, >- "orderable": true, >- "render": function(data, type, row, meta) { >+ data: "amount", >+ searchable: true, >+ orderable: true, >+ render: function(data, type, row, meta) { > var amt = row.amount * -1; > return escape_price(amt); > } > }, > { >- "data": function( row, type, val, meta ) { >+ data: function( row, type, val, meta ) { > var result = '<a class="btn btn-default btn-xs" role="button" data-bs-toggle="modal" data-cashup="'+encodeURIComponent(row.cashup_id)+'" data-register="[% register.description | html %]" href="#cashupSummaryModal"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Summary")+'</a>\n'; > return result; > }, >- "searchable": false, >- "orderable": false >+ searchable: false, >+ orderable: false > } > ] > }, null, 1); >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 c61553b88b3..447c715c76b 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 >@@ -2549,10 +2549,10 @@ > $("#mana_search_result_label").text(_("Results from Mana Knowledge Base")); > $("#mana-loading").hide(); > $("#mana_results_datatable").kohaTable({ >- "pagingType": "full", >- "autoWidth": false, >- "columnDefs": [ >- { "width": "35%", "targets": 1 } >+ pagingType: "full", >+ autoWidth: false, >+ columnDefs: [ >+ { "width": "35%", targets: 1 } > ], > }); > >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 88538ebea63..e4588414b27 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -204,7 +204,6 @@ > > var lostitems_table = $("#lostitems-table").kohaTable( > { >- order: [], > autoWidth: false, > paging: false, > }, >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 c6b25551d24..9d505c7d82b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -1329,7 +1329,7 @@ > let tabSuggestionData = suggestionData.find(s => s.suggestiontype === `${tabName}`) > $("#table_" + tabName).kohaTable( > { >- sorting: [[4, "asc"]], >+ order: [[4, "asc"]], > autoWidth: false, > ajax: { > url: "/api/v1/suggestions?q=" + JSON.stringify(tabSuggestionData.search_params), >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 aa5033dde5c..7e3b73880ac 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 >@@ -351,8 +351,7 @@ > { targets: [3, 4], type: "num-html" }, > ], > dom: "t", >- order: [], >- paging: false, >+ paging: false, > }); > > $("#authorities").kohaTable({ >@@ -360,8 +359,7 @@ > { targets: [3], type: "num-html" }, > ], > dom: "t", >- order: [], >- paging: false, >+ paging: false, > }); > > $("#selectrecords").on("submit",function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >index e975b761323..5d3bdd70591 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt >@@ -270,7 +270,6 @@ > > $("#checkouts, #checkouts_result").kohaTable({ > dom: "t", >- order: [], > paging: false, > }); > >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 fc7943ff235..4d742f1aad6 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 >@@ -358,8 +358,7 @@ > { targets: [1], type: "num-html" }, > ], > dom: "t", >- order: [], >- paging: false, >+ paging: false, > }); > > $("#authorities").kohaTable({ >@@ -367,8 +366,7 @@ > { targets: [1], type: "num-html" }, > ], > dom: "t", >- order: [], >- paging: false, >+ paging: false, > }); > > $("#mainformsubmit").click(function() { >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 ba68b0eb975..00603354510 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -461,20 +461,20 @@ > $(document).ready(function(){ > var table_settings = [% TablesSettings.GetTableSettings( 'tools', 'inventory', 'inventoryt', 'json' ) | $raw %]; > inventorydt = $("#inventoryt").kohaTable({ >- "pagingType": 'full_numbers', >- "bKohaColumnsUseNames": true, >+ pagingType: 'full_numbers', >+ bKohaColumnsUseNames: true, > [% IF uploadedbarcodesflag %] > // sort on callnumber >- "order": [[ 2, "asc" ]], >+ order: [[ 2, "asc" ]], > [% ELSE %] > // first column contains checkboxes >- "columnDefs": [ >- { "orderable": false, "searchable": false, "targets": [ 0 ] } >+ columnDefs: [ >+ { orderable: false, searchable: false, targets: [ 0 ] } > ], > // 3rd column is callnumber >- "order": [[ 2, "asc" ]], >+ order: [[ 2, "asc" ]], > [% END %] >- "drawCallback": function() { >+ drawCallback: function() { > //bind the click handler script to the newly created elements held in the table > $('.openWin').bind('click',function(e){ > e.preventDefault(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 5ba37a094e3..a2900e735d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -471,10 +471,10 @@ > > [% IF import_batch_id %] > $("#records-table").kohaTable({ >- "autoWidth": false, >- "searching": false, >- "processing": true, >- "serverSide": true, >+ autoWidth: false, >+ searching: false, >+ processing: true, >+ serverSide: true, > ajax: { > url: "batch_records_ajax.pl", > data: function ( d ) { >@@ -483,18 +483,18 @@ > }, > }, > bKohaAjaxSVC: true, >- "pagingType": "full_numbers", >- "dom": '<"top pager"iflp>rt<"bottom pager"flp><"clear">', >- "columns": [ >- { "data": "import_record_id" }, >- { "data": "citation" }, >- { "data": "status" }, >- { "data": "overlay_status" }, >- { "data": null, "defaultContent": "" }, >- { "data": null, "defaultContent": "" }, >- { "data": "matched" } >+ pagingType: "full_numbers", >+ dom: '<"top pager"iflp>rt<"bottom pager"flp><"clear">', >+ columns: [ >+ { data: "import_record_id" }, >+ { data: "citation" }, >+ { data: "status" }, >+ { data: "overlay_status" }, >+ { data: null, defaultContent: "" }, >+ { data: null, defaultContent: "" }, >+ { data: "matched" } > ], >- "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull) { >+ rowCallback: function(nRow, aData, iDisplayIndex, iDisplayIndexFull) { > [% IF(record_type == 'auth') %] > var record_details_url = "/cgi-bin/koha/authorities/detail.pl?authid="; > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 1f219a997c5..9115e35e869 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -684,25 +684,25 @@ > } > }, > bKohaAjaxSVC: true, >- 'columns':[ >- { "data": 'dt_public' }, >- { "data": 'dt_shelfname' }, >- { "data": 'dt_count' }, >- { "data": 'dt_is_shared' }, >- { "data": 'dt_owner' }, >- { "data": 'dt_sortby' }, >- { "data": 'dt_created_on' }, >- { "data": 'dt_modification_time' }, >- { "data": 'dt_action', "orderable": false, "className": 'actions' } >+ columns: [ >+ { data: 'dt_public' }, >+ { data: 'dt_shelfname' }, >+ { data: 'dt_count' }, >+ { data: 'dt_is_shared' }, >+ { data: 'dt_owner' }, >+ { data: 'dt_sortby' }, >+ { data: 'dt_created_on' }, >+ { data: 'dt_modification_time' }, >+ { data: 'dt_action', orderable: false, className: 'actions' } > ], >- "columnDefs": [ >- { "visible": false, "targets": [ 'NoVisible' ] } >+ columnDefs: [ >+ { visible: false, targets: [ 'NoVisible' ] } > ], >- "autoWidth": false, >- "pagingType": 'full_numbers', >- "searching": false, >- "processing": true, >- "orderCellsTop": true >+ autoWidth: false, >+ pagingType: 'full_numbers', >+ searching: false, >+ processing: true, >+ orderCellsTop: true > }); > _dt_add_delay_filters(dtListResults.api(), $("#listresultst")); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >index ce022539b8e..4c939b1af8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt >@@ -7,7 +7,7 @@ > "draw": [% draw | html %], > "recordsTotal": [% recordsTotal | html %], > "recordsFiltered": [% recordsFiltered | html %], >- "data": [ >+ data: [ > [% FOREACH d IN data %] > { > "dt_public": >diff --git a/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js b/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js >index 366cff95de3..d0e7c48f279 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js >@@ -4,7 +4,6 @@ $(document).ready(function () { > $("#Aform").preventDoubleFormSubmit(); > $("#files").kohaTable({ > pagingType: "full", >- order: [], > }); > > checkOrderBudgets(); >diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >index 185a5488db5..28761c0068f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >@@ -1383,7 +1383,6 @@ $(document).ready(function () { > returnClaimsTable = $("#return-claims-table").kohaTable({ > autoWidth: false, > dom: "rt", >- order: [], > columnDefs: [{ type: "anti-the", targets: ["anti-the"] }], > columns: [ > { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js >index 3cf5d8053c8..61b92889a59 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/marc_subfields_structure.js >@@ -30,7 +30,6 @@ $(document).ready(function () { > populateHiddenCheckboxes($(this).attr("id").split("-")[1]); > }); > $("#table_marcsubfieldstructure").kohaTable({ >- order: [], > paging: false, > }); > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >index e80a6b54936..75dd67bac33 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >@@ -91,30 +91,30 @@ > > var fines_table = $("#finestable").kohaTable({ > [% IF ENABLE_OPAC_PAYMENTS %] >- "order": [[ 1, "desc" ]], >+ order: [[ 1, "desc" ]], > [% ELSE %] >- "order": [[ 0, "desc" ]], >+ order: [[ 0, "desc" ]], > [% END %] >- "dom": '<"#filter_p">', >- "responsive": { >- "details": { "type": 'column',"target": -1 } >+ dom: '<"#filter_p">', >+ responsive: { >+ details: { "type": 'column',"target": -1 } > }, >- "columnDefs": [ >- { "className": 'dtr-control', "orderable": false, "targets": -1 } >+ columnDefs: [ >+ { className: 'dtr-control', orderable: false, targets: -1 } > ], >- 'drawCallback': function() { >+ drawCallback: function() { > show_hiddentfoot('#finestable'); > } > } ); > > $('table[id^="finestable-"]').kohaTable({ >- "responsive": { >- "details": { "type": 'column',"target": -1 } >+ responsive: { >+ details: { "type": 'column',"target": -1 } > }, >- "columnDefs": [ >- { "className": 'dtr-control', "orderable": false, "targets": -1 } >+ columnDefs: [ >+ { className: 'dtr-control', orderable: false, targets: -1 } > ], >- 'drawCallback': function() { >+ drawCallback: function() { > show_hiddentfoot('table[id^="finestable-"]'); > } > }); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >index 822d0b2834e..0273f1b5364 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >@@ -89,7 +89,7 @@ > $("#course_reserves_table").kohaTable( > { > dom: '<"top"<"table_controls"f>>rt<"clear">', >- sorting: [[1, "asc"]], >+ order: [[1, "asc"]], > asColumnDefs: [{ aTargets: [1], sType: "nsb-nse" }], > language: { > search: "_INPUT_", >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index c761be0ac5e..6794d0d64b8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -1900,7 +1900,7 @@ > $(".subscriptionst").kohaTable( > { > dom: '<"clearfix">t', >- sorting: [[1, "desc"]], >+ order: [[1, "desc"]], > bKohaColumnsUseNames: true, > responsive: { > details: { type: "column", target: -1 }, >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt >index 26edd7663c2..cd5d15f237b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt >@@ -192,7 +192,7 @@ > var table = $("#table_holdshistory").kohaTable({ > dom: '<"top"<"table_entries"i><"table_controls"fB>>t', > autoWidth: false, >- sorting: [[4, "desc"]], >+ order: [[4, "desc"]], > language: { > search: "_INPUT_", > searchPlaceholder: _("Search"), >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >index 1110e7e77e0..08ecadaa640 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >@@ -600,13 +600,13 @@ > > $(function() { > $("#suggestt").kohaTable({ >- "order": [[ 1, "asc" ]], >- "columnDefs": [ >- [% IF ( loggedinusername ) %]{ "targets": [ 0 ], "orderable": false, "searchable": false }[% END %], >- { "className": 'dtr-control', "orderable": false, "targets": -1 }, >+ order: [[ 1, "asc" ]], >+ columnDefs: [ >+ [% IF ( loggedinusername ) %]{ targets: [ 0 ], orderable: false, searchable: false }[% END %], >+ { className: 'dtr-control', orderable: false, targets: -1 }, > { responsivePriority: 1, targets: 1 } > ], >- "responsive": { >+ responsive: { > details: { > type: 'column', > target: -1 >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 961e63c745a..6ee8d3f59bf 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -296,7 +296,7 @@ > }); > > $("#mytagst").kohaTable({ >- sorting: [[2, "asc"]], >+ order: [[2, "asc"]], > columnDefs: [ > { className: "dtr-control", orderable: false, targets: -1 }, > { responsivePriority: 1, targets: 2 }, >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >index b299d103009..7db566b8a95 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >@@ -148,7 +148,7 @@ > <script> > $(function () { > $("#topissuest").kohaTable({ >- sorting: [[3, "desc"]], >+ order: [[3, "desc"]], > columnDefs: [{ className: "dtr-control", orderable: false, targets: -1 }], > responsive: { > details: { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 2bc2eb3631f..230be46f35a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -1209,17 +1209,17 @@ > tableInit( $(this).attr("id") ); > }) > .kohaTable({ >- "sorting" : [[ thIndex, 'asc' ]], >- "dom": '<"top"<"table_entries"><"table_controls"fB>>t', >- "columnDefs": [ >- { "visible": false, "targets" : [ "hidden" ] }, >- { "className": 'dtr-control', "orderable": false, "targets": -1 } >+ order: [[ thIndex, 'asc' ]], >+ dom: '<"top"<"table_entries"><"table_controls"fB>>t', >+ columnDefs: [ >+ { visible: false, "targets" : [ "hidden" ] }, >+ { className: 'dtr-control', orderable: false, targets: -1 } > ], >- "language": { >- "search": "_INPUT_", >- "searchPlaceholder": _("Search") >+ language: { >+ search: "_INPUT_", >+ searchPlaceholder: _("Search") > }, >- "responsive": { >+ responsive: { > details: { > type: 'column', > target: -1 >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index 52227a6b429..9310b462444 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -486,7 +486,7 @@ > dTables.each(function(){ > var thIndex = $(this).find("th.psort").index(); > $(this).kohaTable({ >- sorting: [[thIndex, "asc"]], >+ order: [[thIndex, "asc"]], > dom: '<"top"<"table_entries"><"table_controls"f>>t<"clear">', > columnDefs: [ > { targets: ["noshow"], visible: false, searchable: false }, >-- >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 39715
:
183067
|
183068
| 183473