jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

searchable: fix searching for polymorphic attributes.

Browse Source 
Fix not being able to use the full set of search operators on polymorphic `model_id` and
`model_type` attributes. Before things like `search[model_type]=Post` worked, but
`search[model_type_not_eq]=Post` or other `model_type_*` operators didn't.
This commit is contained in:
evazion
2022-09-29 03:23:42 -05:00
parent 09eb763e3c
commit c5b215ffcb
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/logical/concerns/searchable.rb
View File

@@ -648,13 +648,8 @@ module Searchable
relation = visible(relation, attr).where(attr => model.visible(current_user).search(params[model_key], current_user))
end
if params["#{attr}_id"].present?
relation = search_context(relation).search_attribute("#{attr}_id")
end
if params["#{attr}_type"].present? && !model_specified
relation = search_context(relation).search_attribute("#{attr}_type")
end
relation = search_context(relation).search_attribute("#{attr}_id")
relation = search_context(relation).search_attribute("#{attr}_type")
relation
end