Skip to content

Commit 1895169

Browse files
author
M. Saiqul Haq
committed
fix AjaxDatatablesRails::base#sort_column when params not valid
1 parent 03a7379 commit 1895169

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

lib/ajax-datatables-rails/base.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,11 @@ def per_page
154154
end
155155

156156
def sort_column(item)
157-
sortable_column = sortable_columns[item[:column].to_i].split(".")
158-
model, column = sortable_column
159-
unless models[model].nil?
160-
sortable_column = [models[model].table_name.to_s, column].join(".")
161-
end
162-
sortable_column
157+
column = sortable_columns[item[:column].to_i]
158+
return nil if column.nil?
159+
model, col = column.split(".")
160+
return [models[model].table_name.to_s, col].join(".") unless models[model].nil?
161+
column
163162
end
164163

165164
def sort_direction(item)

0 commit comments

Comments
 (0)