From 8e9e56d0d4aefef9ef7bd7bc48d9e859aadc465e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 5 Nov 2013 11:31:20 -0500 Subject: [PATCH] Bug 11203 - Datatables in acqusitions do not ignore "stopwords" in titles Sorting by the "summary" column does not produce the preferred results. Title beginning with 'a', 'an', or 'the' are sorted using those articles. Test plan: 1) Place an order for 2 items with the titles "Alpha" and "The Alpha", along with some other records with titles starting with something between 'a' and 't', and 't' and 'z' 2) Sort the "pending orders" table, note the incorrect sorting 3) Receive all the items 4) Sort the "already received" table, note the incorrect sorting 5) Apply the patch 6) Repeat steps 1-4, note the corrected sorting 7) Check acqui/basket.pl for correct sorting 8) Check acqui/invoice.pl for correct sorting Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 9 +++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 7 +++++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index a0ba55000e..2a23ad6d63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -94,11 +94,12 @@ var orderst = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, { "sPaginationType": "four_button", [% IF ( active ) %] - [% UNLESS ( closedate ) %] "aoColumnDefs": [ - { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, + [% UNLESS ( closedate ) %] + { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false }, + [% END %] + { "sType": "anti-the", "aTargets": [ "anti-the" ] } ], - [% END %] [% END %] } ) ); var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, { @@ -393,7 +394,7 @@ No. - Order + Order RRP tax exc. ecost tax exc. RRP tax inc. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 0708745043..002270e972 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -27,7 +27,10 @@ bInfo: false, bPaginate: false, bFilter: false, - sDom: "t" + sDom: "t", + "aoColumnDefs": [ + { "sType": "anti-the", "aTargets": [ "anti-the" ] } + ] })); [% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %] $("#invoice_files_table").dataTable($.extend(true, {}, dataTablesDefaults, { @@ -131,7 +134,7 @@ - + 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 05de2889e5..f705694b6f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -32,7 +32,7 @@ { "sType": "html" }, { "sType": "html" }, { "sType": "num-html" }, - { "sType": "html" }, + { "sType": "anti-the" }, null, null, null, @@ -76,7 +76,7 @@ { "sType": "html" }, { "sType": "html" }, { "sType": "num-html" }, - null, + { "sType": "anti-the" }, null, null, null, -- 2.39.5
SummarySummary Library Actual cost tax exc. Actual cost tax inc.