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

fixes #1538

Browse Source
This commit is contained in:
Toks
2013-10-09 14:11:38 -04:00
parent fed48da2df
commit 34716298b6
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/post_query_builder.rb
View File

@@ -190,6 +190,12 @@ class PostQueryBuilder
end end
end end
if q[:pool] == "none"
relation = relation.where("posts.pool_string = ''")
elsif q[:pool] == "any"
relation = relation.where("posts.pool_string != ''")
end
if q[:subscriptions] if q[:subscriptions]
relation = add_tag_subscription_relation(q[:subscriptions], relation) relation = add_tag_subscription_relation(q[:subscriptions], relation)
has_constraints! has_constraints!

8
app/models/tag.rb
View File

@@ -379,7 +379,13 @@ class Tag < ActiveRecord::Base
q[:tags][:exclude] << "pool:#{Pool.name_to_id($2)}" q[:tags][:exclude] << "pool:#{Pool.name_to_id($2)}"
when "pool" when "pool"
q[:tags][:related] << "pool:#{Pool.name_to_id($2)}" if $2.downcase == "none"
q[:pool] = "none"
elsif $2.downcase == "any"
q[:pool] = "any"
else
q[:tags][:related] << "pool:#{Pool.name_to_id($2)}"
end
when "-fav" when "-fav"
q[:tags][:exclude] << "fav:#{User.name_to_id($2)}" q[:tags][:exclude] << "fav:#{User.name_to_id($2)}"