fixes #1946

app/controllers/pool_elements_controller.rb

@@ -22,7 +22,7 @@ class PoolElementsController < ApplicationController
   end
 
   def all_select
-    @pools = Pool.active.order("name").select("id, name").all
+    @pools = Pool.undeleted.where("is_active = true").order("name").select("id, name").all
   end
 
 private

app/controllers/pools_controller.rb

@@ -14,7 +14,7 @@ class PoolsController < ApplicationController
   end
 
   def index
-    @pools = Pool.active.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
+    @pools = Pool.undeleted.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
     respond_with(@pools) do |format|
       format.xml do
         render :xml => @pools.to_xml(:root => "pools")

app/models/pool.rb

@@ -18,7 +18,7 @@ class Pool < ActiveRecord::Base
   attr_accessible :is_deleted, :as => [:janitor, :moderator, :admin]
 
   module SearchMethods
-    def active
+    def undeleted
       where("is_deleted = false")
     end