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

fixes #2417

Browse Source
This commit is contained in:
r888888888
2015-06-25 13:51:05 -07:00
parent 3cc7dbbedc
commit 1d9596d7f2
64 changed files with 244 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/artist.rb
View File

@@ -329,7 +329,7 @@ class Artist < ActiveRecord::Base
end
def other_names_match(string)
if string =~ /\*/ && CurrentUser.user.is_builder?
if string =~ /\*/ && CurrentUser.is_builder?
where("other_names ILIKE ? ESCAPE E'\\\\'", string.to_escaped_for_sql_like)
else
where("other_names_index @@ to_tsquery('danbooru', E?)", Artist.normalize_name(string).to_escaped_for_tsquery)
@@ -352,7 +352,7 @@ class Artist < ActiveRecord::Base
def any_name_matches(name)
stripped_name = normalize_name(name).to_escaped_for_sql_like
if name =~ /\*/ && CurrentUser.user.is_builder?
if name =~ /\*/ && CurrentUser.is_builder?
where("(name LIKE ? ESCAPE E'\\\\' OR other_names LIKE ? ESCAPE E'\\\\')", stripped_name, stripped_name)
else
name_for_tsquery = normalize_name(name).to_escaped_for_tsquery
@@ -479,6 +479,6 @@ class Artist < ActiveRecord::Base
end
def visible?
!is_banned? || CurrentUser.user.is_janitor?
!is_banned? || CurrentUser.is_moderator?
end
end