From 318c322a1cc488ebec72be03bfc428f24e208d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= Date: Wed, 20 Mar 2019 06:00:10 +0100 Subject: [PATCH] Fix sorting of custom columns on repository datatables --- app/services/repository_datatable_service.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/services/repository_datatable_service.rb b/app/services/repository_datatable_service.rb index 6e4f44ef0..00da02887 100644 --- a/app/services/repository_datatable_service.rb +++ b/app/services/repository_datatable_service.rb @@ -53,11 +53,14 @@ class RepositoryDatatableService 'repository_rows.id'] + Extends::REPOSITORY_EXTRA_SEARCH_ATTR - repository_rows = repository_rows - .left_outer_joins(includes_json) - .where_attributes_like(searchable_attributes, - search_value) - .distinct + # Using distinct raises error when combined with sort on a custom column + repository_row_ids = repository_rows + .left_outer_joins(includes_json) + .where_attributes_like(searchable_attributes, + search_value) + .pluck(:id) + .uniq + repository_rows = RepositoryRow.where(id: repository_row_ids) end repository_rows