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

Merge pull request #3472 from BrokenEagle/fix-status-active-search

Browse Source 
Fix status:active so that it doesn't show flagged posts
This commit is contained in:
Albert Yi
2017-12-28 13:47:25 -08:00
committed by GitHub
parent b315ee25bc 7c9dd80d35
commit 0f7b9c3a21
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/post_query_builder.rb
View File

@@ -137,7 +137,7 @@ class PostQueryBuilder
elsif q[:status] == "banned" elsif q[:status] == "banned"
relation = relation.where("posts.is_banned = TRUE") relation = relation.where("posts.is_banned = TRUE")
elsif q[:status] == "active" elsif q[:status] == "active"
relation = relation.where("posts.is_pending = FALSE AND posts.is_deleted = FALSE AND posts.is_banned = FALSE") relation = relation.where("posts.is_pending = FALSE AND posts.is_deleted = FALSE AND posts.is_banned = FALSE AND posts.is_flagged = FALSE")
elsif q[:status] == "all" || q[:status] == "any" elsif q[:status] == "all" || q[:status] == "any"
# do nothing # do nothing
elsif q[:status_neg] == "pending" elsif q[:status_neg] == "pending"
@@ -149,7 +149,7 @@ class PostQueryBuilder
elsif q[:status_neg] == "banned" elsif q[:status_neg] == "banned"
relation = relation.where("posts.is_banned = FALSE") relation = relation.where("posts.is_banned = FALSE")
elsif q[:status_neg] == "active" elsif q[:status_neg] == "active"
relation = relation.where("posts.is_pending = TRUE OR posts.is_deleted = TRUE OR posts.is_banned = TRUE") relation = relation.where("posts.is_pending = TRUE OR posts.is_deleted = TRUE OR posts.is_banned = TRUE OR posts.is_flagged = TRUE")
end end
if hide_deleted_posts?(q) if hide_deleted_posts?(q)