fixes #2016

app/models/pool.rb

@@ -18,6 +18,10 @@ class Pool < ActiveRecord::Base
   attr_accessible :is_deleted, :as => [:janitor, :moderator, :admin]
 
   module SearchMethods
+    def deleted
+      where("is_deleted = true")
+    end
+
     def undeleted
       where("is_deleted = false")
     end
@@ -193,7 +197,7 @@ class Pool < ActiveRecord::Base
     return if is_deleted?
 
     update_attributes(:post_ids => add_number_to_string(post.id, post_ids), :post_count => post_count + 1)
-    post.add_pool!(self)
+    post.add_pool!(self, true)
     clear_post_id_array
   end
 
@@ -202,7 +206,7 @@ class Pool < ActiveRecord::Base
     return if is_deleted?
 
     update_attributes(:post_ids => remove_number_from_string(post.id, post_ids), :post_count => post_count - 1)
-    post.remove_pool!(self)
+    post.remove_pool!(self, true)
     clear_post_id_array
   end
 
@@ -231,12 +235,12 @@ class Pool < ActiveRecord::Base
 
     added.each do |post_id|
       post = Post.find(post_id)
-      post.add_pool!(self)
+      post.add_pool!(self, true)
     end
 
     removed.each do |post_id|
       post = Post.find(post_id)
-      post.remove_pool!(self)
+      post.remove_pool!(self, true)
     end
 
     self.post_count = post_id_array.size

app/models/post.rb

@@ -629,17 +629,17 @@ class Post < ActiveRecord::Base
       pool_string =~ /(?:\A| )pool:#{pool_id}(?:\Z| )/
     end
 
-    def add_pool!(pool)
+    def add_pool!(pool, force = false)
       return if belongs_to_pool?(pool)
-      return if pool.is_deleted?
+      return if pool.is_deleted? && !force
       self.pool_string = "#{pool_string} pool:#{pool.id}".strip
       update_column(:pool_string, pool_string) unless new_record?
       pool.add!(self)
     end
 
-    def remove_pool!(pool)
+    def remove_pool!(pool, force = false)
       return unless belongs_to_pool?(pool)
-      return if pool.is_deleted?
+      return if pool.is_deleted? && !force
       self.pool_string = pool_string.gsub(/(?:\A| )pool:#{pool.id}(?:\Z| )/, " ").strip
       update_column(:pool_string, pool_string) unless new_record?
       pool.remove!(self)