Skip to content

Commit 05b1565

Browse files
committed
:nulls_last is optin and cannot be set from request params
1 parent 18c0b9e commit 05b1565

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/ajax-datatables-rails/datatable/column/order.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def sort_query
2020

2121
# Add option to sort null values last
2222
def nulls_last?
23-
@view_column[:nulls_last] || @options[:nulls_last] == 'true'
23+
@view_column.fetch(:nulls_last, false)
2424
end
2525

2626
end

spec/ajax-datatables-rails/datatable/column_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
let(:column) { datatable.datatable.columns.first }
1111

1212
before do
13-
datatable.params[:columns] = {'0'=>{'data'=>'username', 'name'=>'', 'searchable'=>'true', 'orderable'=>'true', 'search'=>{'value'=>'searchvalue', 'regex'=>'false'}, 'nulls_last'=>'true'}}
13+
datatable.params[:columns] = {'0'=>{'data'=>'username', 'name'=>'', 'searchable'=>'true', 'orderable'=>'true', 'search'=>{'value'=>'searchvalue', 'regex'=>'false'}}}
1414
end
1515

1616
it 'should be orderable' do
1717
expect(column.orderable?).to eq(true)
1818
end
1919

2020
it 'should sort nulls last' do
21-
expect(column.nulls_last?).to eq(true)
21+
expect(column.nulls_last?).to eq(false)
2222
end
2323

2424
it 'should be searchable' do

0 commit comments

Comments
 (0)