Merge pull request #3009 from evazion/fix-dmails-search

Fix #1868: Dmail search improvements: subject, searchbox
This commit is contained in:
Albert Yi
2017-05-01 14:05:22 -07:00
committed by GitHub
7 changed files with 27 additions and 26 deletions

View File

@@ -102,6 +102,11 @@ class Dmail < ActiveRecord::Base
where("is_deleted = ?", true)
end
def title_matches(query)
query = "*#{query}*" unless query =~ /\*/
where("lower(dmails.title) LIKE ?", query.to_escaped_for_sql_like)
end
def search_message(query)
if query =~ /\*/ && CurrentUser.user.is_builder?
escaped_query = query.to_escaped_for_sql_like
@@ -131,6 +136,10 @@ class Dmail < ActiveRecord::Base
q = where("true")
return q if params.blank?
if params[:title_matches].present?
q = q.title_matches(params[:title_matches])
end
if params[:message_matches].present?
q = q.search_message(params[:message_matches])
end