From 6b284d8c890e5765feedd64d51a221efb8f2b654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= Date: Fri, 16 Jun 2017 16:00:10 +0200 Subject: [PATCH] Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357] --- app/datatables/repository_datatable.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/datatables/repository_datatable.rb b/app/datatables/repository_datatable.rb index 9e721740e..c71e4389c 100644 --- a/app/datatables/repository_datatable.rb +++ b/app/datatables/repository_datatable.rb @@ -179,12 +179,10 @@ class RepositoryDatatable < AjaxDatatablesRails::Base def fetch_records records = get_raw_records records = @assigned_rows if @my_module && params[:assigned] == 'assigned' - records = filter_records(records) if params[:search].present? && - !sorting_by_custom_column + records = filter_records(records) if params[:search].present? records = sort_records(records) if params[:order].present? - records = paginate_records(records) if !(params[:length].present? && - params[:length] == '-1') && - !sorting_by_custom_column + records = paginate_records(records) unless params[:length].present? && + params[:length] == '-1' escape_special_chars records end @@ -192,7 +190,7 @@ class RepositoryDatatable < AjaxDatatablesRails::Base # Overriden to make it work for custom columns, because they are polymorphic # NOTE: Function assumes the provided records/rows are only from the current # repository! - def simple_search(repo_rows) + def filter_records(repo_rows) return repo_rows unless params[:search].present? && params[:search][:value].present? search_val = params[:search][:value]