From afe376b3a364acc427aa5868e11828951a048423 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 16 Jul 2021 10:49:41 +0200 Subject: [PATCH 1/2] Fix sorting by role with filtering in team members table [SCI-5908] --- app/datatables/custom_datatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/datatables/custom_datatable.rb b/app/datatables/custom_datatable.rb index 0b60d9e12..033bb49b8 100644 --- a/app/datatables/custom_datatable.rb +++ b/app/datatables/custom_datatable.rb @@ -18,8 +18,8 @@ class CustomDatatable < AjaxDatatablesRails::Base def fetch_records records = get_raw_records - records = sort_records(records) if order_params.present? records = filter_records(records) if dt_params[:search].present? + records = sort_records(records) if order_params.present? records = paginate_records(records) unless dt_params[:length].present? && dt_params[:length] == '-1' records From 4bfc52b583d17ee98381d6d39219833ffff33802 Mon Sep 17 00:00:00 2001 From: miha Date: Mon, 19 Jul 2021 10:16:05 +0200 Subject: [PATCH 2/2] Bump version to 1.22.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6fee2fedb..89144dbc3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.22.2 +1.22.3