From 17eaec7a486800cfdc1f6b8fde8836738bed6406 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 12 Feb 2021 13:14:16 +0000 Subject: [PATCH] Bug 27680: Add support for sorting fields with multiple data points This patch adds proper handling for sorting a single column that is constructed of multiple data entities.. i.e `"data": "string1:string2"` It does NOT add support for filtering on multiple columns yet. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit fa1671aba529e55f124eb759f3b09e237a7282fe) Signed-off-by: Fridolin Somers --- Koha/REST/Plugin/Query.pm | 3 ++- api/v1/swagger/parameters.json | 2 +- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Koha/REST/Plugin/Query.pm b/Koha/REST/Plugin/Query.pm index ea6695ff37..c7ab65dc5a 100644 --- a/Koha/REST/Plugin/Query.pm +++ b/Koha/REST/Plugin/Query.pm @@ -92,9 +92,10 @@ Generates the DBIC order_by attributes based on I<$params>, and merges into I<$a if ( defined $args->{params}->{_order_by} ) { my $order_by = $args->{params}->{_order_by}; + $order_by = [ split(/,/, $order_by) ] if ( index(',',$order_by) == -1); if ( reftype($order_by) and reftype($order_by) eq 'ARRAY' ) { my @order_by = map { _build_order_atom({ string => $_, result_set => $result_set }) } - @{ $args->{params}->{_order_by} }; + @{ $order_by }; $attributes->{order_by} = \@order_by; } else { diff --git a/api/v1/swagger/parameters.json b/api/v1/swagger/parameters.json index ddced814d0..3c13223f9e 100644 --- a/api/v1/swagger/parameters.json +++ b/api/v1/swagger/parameters.json @@ -63,7 +63,7 @@ "required": false, "description": "Sorting criteria", "type": "array", - "collectionFormat": "pipes", + "collectionFormat": "csv", "items": { "type": "string" } diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index 2957a8e214..f8517131a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -593,9 +593,9 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { order.forEach(function (e,i) { var order_col = e.column; var order_by = options.columns[order_col].data; - order_by = order_by.split(':')[0]; + order_by = order_by.split(':'); var order_dir = e.dir == 'asc' ? '+' : '-'; - dataSet._order_by = order_dir + (!order_by.includes('.')?'me.'+order_by:order_by); + dataSet._order_by = order_by.map(x => order_dir + (!x.includes('.')?'me.'+x:x)).join(','); }); } -- 2.39.5