From e73907331391306152a28b5c9906312badf7c904 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 8 Oct 2019 17:11:17 +0000 Subject: [PATCH] Bug 13749: On loading holds in patron account 'processing' is not translatable This patch updates the DataTables configuration for two tables: The checkouts and holds lists shown on the checkout and patron details screen. The tables lacked the standard application of a custom set of defaults defined in js/datatables.js. It is in this file that custom language strings are defined for DataTable interface elements, pulling in the translated values from datatables.inc. Without our custom defaults applied, DataTables used its own defaults, which are not translated. To test, apply the patch and check out to a patron who has both checkouts and holds. The more the better to give you more time to observer the loading state of the tables. - Checkouts: This table doesn't exhibit any visible problems because page-specific text is defined for the table's "Loading" message. However, it still makes sense to apply the defaults to the table for consistency's sake. There should be no visible changes to the table. - Holds: From the checkout or patron details page click the "Holds" tab. While the table loads there should be a "Processing" message. If you switch to another translation the message should appear in that language. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize (cherry picked from commit 9af572c7969f5372853d238ee35f530e4e9fc9f6) Signed-off-by: Hayley Mapley (cherry picked from commit 06ff77dbc766df3301440d587e5f74dc8ce477d6) --- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 4 ++-- koha-tmpl/intranet-tmpl/prog/js/holds.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 9902f5be01..093a3982f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -566,7 +566,7 @@ $(document).ready(function() { var relativesIssuesTable; $("#relatives-issues-tab").click( function() { if ( ! relativesIssuesTable ) { - relativesIssuesTable = $("#relatives-issues-table").dataTable({ + relativesIssuesTable = $("#relatives-issues-table").dataTable($.extend(true, {}, dataTablesDefaults, { "bAutoWidth": false, "sDom": "rt", "aaSorting": [], @@ -719,7 +719,7 @@ $(document).ready(function() { fnCallback(json) } ); }, - }); + })); } }); diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js index 0ca8fb8930..433f18dbab 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -10,7 +10,7 @@ $(document).ready(function() { function load_holds_table() { var holds = new Array(); if ( ! holdsTable ) { - holdsTable = $("#holds-table").dataTable({ + holdsTable = $("#holds-table").dataTable($.extend(true, {}, dataTablesDefaults, { "bAutoWidth": false, "sDom": "rt", "columns": [ @@ -170,7 +170,7 @@ $(document).ready(function() { d.borrowernumber = borrowernumber; } }, - }); + })); $('#holds-table').on( 'draw.dt', function () { $(".hold-suspend").on( "click", function() { -- 2.39.5