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

Model#search: refactor searching for attributes.

Browse Source
This commit is contained in:
evazion
2019-08-29 20:24:52 -05:00
parent 6fc4b63fa8
commit 7b8584e3b0
26 changed files with 90 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/models/forum_topic.rb
View File

@@ -39,10 +39,6 @@ class ForumTopic < ApplicationRecord
def reverse_category_mapping
@reverse_category_mapping ||= CATEGORIES.invert
end
def for_category_id(cid)
where(:category_id => cid)
end
end
def category_name
@@ -70,25 +66,13 @@ class ForumTopic < ApplicationRecord
def search(params)
q = super
q = q.permitted
q = q.search_attributes(params, :is_sticky, :is_locked, :is_deleted, :category_id, :title)
q = q.text_attribute_matches(:title, params[:title_matches], index_column: :text_index)
if params[:mod_only].present?
q = q.where("min_level >= ?", MIN_LEVELS[:Moderator])
end
q = q.attribute_matches(:title, params[:title_matches], index_column: :text_index)
if params[:category_id].present?
q = q.for_category_id(params[:category_id])
end
if params[:title].present?
q = q.where("title = ?", params[:title])
end
q = q.attribute_matches(:is_sticky, params[:is_sticky])
q = q.attribute_matches(:is_locked, params[:is_locked])
q = q.attribute_matches(:is_deleted, params[:is_deleted])
case params[:order]
when "sticky"
q = q.sticky_first