File tree Expand file tree Collapse file tree 2 files changed +15
-1
lines changed
lib/ajax-datatables-rails/orm
spec/ajax-datatables-rails/orm Expand file tree Collapse file tree 2 files changed +15
-1
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ def build_conditions_for_datatable
3939 crit << searchable_columns . map do |simple_column |
4040 simple_column . search = search
4141 simple_column . search_query
42- end . reduce ( :or )
42+ end . compact . reduce ( :or )
4343 end . compact . reduce ( :and )
4444 criteria
4545 end
Original file line number Diff line number Diff line change 106106 expect ( results ) . not_to include ( 'msmith' )
107107 end
108108 end
109+
110+ context 'when column.search_query returns nil' do
111+ let ( :datatable ) { DatatableCondUnknown . new ( sample_params ) }
112+
113+ before ( :each ) do
114+ datatable . params [ :search ] = { value : 'john doe' , regex : 'false' }
115+ end
116+
117+ it 'does not raise error' do
118+ expect {
119+ datatable . data . size
120+ } . to_not raise_error
121+ end
122+ end
109123 end
110124 end
111125
You can’t perform that action at this time.
0 commit comments