From 34716298b6a6cbcb0d7e1861a501b5cb813434d6 Mon Sep 17 00:00:00 2001 From: Toks Date: Wed, 9 Oct 2013 14:11:38 -0400 Subject: [PATCH] fixes #1538 --- app/logical/post_query_builder.rb | 6 ++++++ app/models/tag.rb | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb index 47bca783e..ca76764fa 100644 --- a/app/logical/post_query_builder.rb +++ b/app/logical/post_query_builder.rb @@ -190,6 +190,12 @@ class PostQueryBuilder 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] relation = add_tag_subscription_relation(q[:subscriptions], relation) has_constraints! diff --git a/app/models/tag.rb b/app/models/tag.rb index 4b1842845..09c3ce042 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -379,7 +379,13 @@ class Tag < ActiveRecord::Base q[:tags][:exclude] << "pool:#{Pool.name_to_id($2)}" 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" q[:tags][:exclude] << "fav:#{User.name_to_id($2)}"