From 57de81686bc1ded2818501d3d18ad6ce864b544d Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Wed, 6 Jan 2021 19:46:24 +0000 Subject: [PATCH] Support using all numeric searches for includes --- app/logical/concerns/searchable.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/logical/concerns/searchable.rb b/app/logical/concerns/searchable.rb index b40f57f90..d2b4a0baa 100644 --- a/app/logical/concerns/searchable.rb +++ b/app/logical/concerns/searchable.rb @@ -10,6 +10,10 @@ module Searchable 1 + params.values.map { |v| parameter_hash?(v) ? parameter_depth(v) : 1 }.max end + def prefix_matches(prefix, params) + params.keys.any? { |x| x.starts_with?(prefix) } + end + def negate_relation unscoped.where(all.where_clause.invert.ast) end @@ -279,7 +283,7 @@ module Searchable def search_includes(attr, params, type, current_user) model = Kernel.const_get(type) - if params["#{attr}_id"].present? + if prefix_matches("#{attr}_id", params) search_attribute("#{attr}_id", params, current_user) elsif params["has_#{attr}"].to_s.truthy? || params["has_#{attr}"].to_s.falsy? search_has_include(attr, params["has_#{attr}"].to_s.truthy?, model)