From b32783c8bad6c92a61b53273cdf6c6173a10c72d Mon Sep 17 00:00:00 2001 From: Toks Date: Sun, 18 Aug 2013 18:24:10 -0400 Subject: [PATCH] fixes #1946 --- app/controllers/pool_elements_controller.rb | 2 +- app/controllers/pools_controller.rb | 2 +- app/models/pool.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/pool_elements_controller.rb b/app/controllers/pool_elements_controller.rb index 898b76c98..ab7709097 100644 --- a/app/controllers/pool_elements_controller.rb +++ b/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 diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb index 224c49e0e..d223905af 100644 --- a/app/controllers/pools_controller.rb +++ b/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") diff --git a/app/models/pool.rb b/app/models/pool.rb index 1713e622b..307cdfb09 100644 --- a/app/models/pool.rb +++ b/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