diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-28 01:02:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-28 01:02:21 +0200 |
commit | ab33c4df942ec3fdc4d891f3db7ac8cdd3436945 (patch) | |
tree | b526a52c980fef122d38302234c0bb8361f6bd14 /app/models | |
parent | 234c729c5244160c89070960fd06de23ae31e13a (diff) |
Add `exclude_unreviewed` param to `GET /api/v2/search` REST API (#11977)
Make it so normal search returns even unreviewed matches, but autosuggestions do not. Fix #11960
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/tag.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/models/tag.rb b/app/models/tag.rb index b52b9bc9f..9aca3983f 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -124,16 +124,15 @@ class Tag < ApplicationRecord end end - def search_for(term, limit = 5, offset = 0) + def search_for(term, limit = 5, offset = 0, options = {}) normalized_term = normalize(term.strip).mb_chars.downcase.to_s pattern = sanitize_sql_like(normalized_term) + '%' + query = Tag.listable.where(arel_table[:name].lower.matches(pattern)) + query = query.where(arel_table[:name].lower.eq(normalized_term).or(arel_table[:reviewed_at].not_eq(nil))) if options[:exclude_unreviewed] - Tag.listable - .where(arel_table[:name].lower.matches(pattern)) - .where(arel_table[:name].lower.eq(normalized_term).or(arel_table[:reviewed_at].not_eq(nil))) - .order(Arel.sql('length(name) ASC, name ASC')) - .limit(limit) - .offset(offset) + query.order(Arel.sql('length(name) ASC, name ASC')) + .limit(limit) + .offset(offset) end def find_normalized(name) |