From c0b56714162109201d48bbecf4ad508fb8c1fd44 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 17 Mar 2021 18:27:16 +0000 Subject: [PATCH] Bug 27975: Replace obsolete title-string sorting: Administration templates This patch modifies two administration templates to replace the use of the "title-string" DataTables sorting method with the newer "data-order" attribute. To test, apply the patch and view the following pages to confirm that columns containing dates sort correctly when using any setting of the "dateformat" system preference: - Administration -> Currencies and exchange rates - Administration -> Budgets - Both the "Active budgets" and "Inactive budgets" tabs Signed-off-by: Amit Gupta Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- .../prog/en/modules/admin/aqbudgetperiods.tt | 17 ++++++++--------- .../prog/en/modules/admin/currency.tt | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) 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 1306d1ae30..753b2a30d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -480,8 +480,8 @@ Budget name - Start date - End date + Start date + End date Locked Total Actions @@ -491,8 +491,8 @@ [% FOREACH period_active IN period_active_loop %] [% period_active.budget_period_description | html %] - [% period_active.budget_period_startdate | $KohaDates %] - [% period_active.budget_period_enddate | $KohaDates %] + [% period_active.budget_period_startdate | $KohaDates %] + [% period_active.budget_period_enddate | $KohaDates %] [% IF ( period_active.budget_period_locked ) %] Locked @@ -516,8 +516,8 @@ Budget name - Start date - End date + Start date + End date Locked Total Actions @@ -527,8 +527,8 @@ [% FOREACH period_loo IN period_inactive_loop %] [% period_loo.budget_period_description | html %] - [% period_loo.budget_period_startdate | $KohaDates %] - [% period_loo.budget_period_enddate | $KohaDates %] + [% period_loo.budget_period_startdate | $KohaDates %] + [% period_loo.budget_period_enddate | $KohaDates %] [% IF ( period_loo.budget_period_locked ) %] Locked[% END %] [% period_loo.budget_period_total | $Price %] @@ -571,7 +571,6 @@ $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false }, - { "sType": "title-string", "aTargets" : [ "title-string" ] } ], "sPaginationType": "full", 'bAutoWidth': false diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 6fdb6079c7..c257ff96c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -215,7 +215,7 @@ Rate Symbol ISO code - Last updated + Last updated Active Archived Actions @@ -228,7 +228,7 @@ [% currency.rate | html %] [% currency.symbol | html %] [% currency.isocode | html %] - [% currency.timestamp | $KohaDates %] + [% currency.timestamp | $KohaDates %] [% IF currency.active %]✓[% END %] [% IF currency.archived %]Yes[% END %] -- 2.39.2