lib/data_table/mongoid.rb in data_table-0.4.2 vs lib/data_table/mongoid.rb in data_table-0.4.3
- old
+ new
@@ -23,10 +23,15 @@
{search_fields.first => /#{terms.first}/i}
else
{search_fields.first => {"$all" => terms.map {|term| /#{term}/i }}}
end
else
- {"$or" => search_fields.map {|field| {field => /#{query}/i} }}
+ terms = query.split(/\s+/)
+ terms_and_fields = terms.map do |term|
+ {"$or" => search_fields.map {|field| {field => /#{term}/i} }}
+ end
+
+ {"$and" => terms_and_fields}
end
end
def _order_by_fields params, fields
[fields[params[:isortcol_0].to_i], params[:ssortdir_0] || "asc"]