app/models/effective/effective_datatable/resource.rb in effective_datatables-4.3.24 vs app/models/effective/effective_datatable/resource.rb in effective_datatables-4.3.25
- old
+ new
@@ -117,11 +117,11 @@
when false
opts[:search] = { as: :null }; next
when Symbol
opts[:search] = { as: opts[:search] }
when Array, ActiveRecord::Relation
- opts[:search] = { collection: opts[:search] }
+ opts[:search] = { as: :select, collection: opts[:search] }
when Hash
# Nothing
else
raise "column #{name} unexpected search value"
end
@@ -144,9 +144,11 @@
search[:fuzzy] = true unless search.key?(:fuzzy)
if array_collection? && opts[:resource].present?
search.reverse_merge!(resource.search_form_field(name, collection.first[opts[:index]]))
+ elsif search[:as] == :select && search.key?(:collection)
+ # No Action
elsif search[:as] != :string
search.reverse_merge!(resource.search_form_field(name, opts[:as]))
end
# Assign default include_null