scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-10 22:53:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #400 from okriuchykhin/ok_SCI_846

Browse source 
Fixes sorting of custom columns in samples datatable [SCI-846]
This commit is contained in:
okriuchykhin 2017-01-11 15:34:02 +01:00 committed by GitHub
commit 404952336d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/datatables/sample_datatable.rb
View file

@ -94,7 +94,7 @@ class SampleDatatable < AjaxDatatablesRails::Base
num_cf = CustomField.where(organization_id: @organization).count num_cf = CustomField.where(organization_id: @organization).count
array = [] array = []
for _ in 0..num_cf num_cf.times do
array << 'SampleCustomField.value' array << 'SampleCustomField.value'
end end
array array
@ -306,7 +306,10 @@ class SampleDatatable < AjaxDatatablesRails::Base
records = records.where("samples.id IN (#{filter_query})") records = records.where("samples.id IN (#{filter_query})")
end end
cf_id = all_custom_fields[params[:order].values[0]["column"].to_i - 7].id ci = sortable_displayed_columns[
params[:order].values[0][:column].to_i - 1
]
cf_id = @cf_mappings.key((ci.to_i + 1).to_s)
dir = sort_direction(params[:order].values[0]) dir = sort_direction(params[:order].values[0])
# Because samples can have multiple sample custom fields, we first group # Because samples can have multiple sample custom fields, we first group
@ -366,7 +369,7 @@ class SampleDatatable < AjaxDatatablesRails::Base
end end
def sorting_by_custom_column def sorting_by_custom_column
sort_column(params[:order].values[0]) == 'SampleCustomField.value' sort_column(params[:order].values[0]) == 'sample_custom_fields.value'
end end
# Escapes special characters in search query # Escapes special characters in search query