searchable: refactor searchable_includes.

Pass searchable associations directly to search_attributes instead of
defining them separately in searchable_includes.
This commit is contained in:
evazion
2020-12-16 22:43:18 -06:00
parent e771c0fca8
commit ee4516f5fe
38 changed files with 46 additions and 185 deletions

View File

@@ -31,7 +31,7 @@ class BulkUpdateRequest < ApplicationRecord
end
def search(params = {})
q = search_attributes(params, :id, :created_at, :updated_at, :script, :tags)
q = search_attributes(params, :id, :created_at, :updated_at, :script, :tags, :user, :forum_topic, :forum_post, :approver)
q = q.text_attribute_matches(:script, params[:script_matches])
if params[:status].present?
@@ -126,10 +126,6 @@ class BulkUpdateRequest < ApplicationRecord
status == "rejected"
end
def self.searchable_includes
[:user, :forum_topic, :forum_post, :approver]
end
def self.available_includes
[:user, :forum_topic, :forum_post, :approver]
end