diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb index 3fb457b95..11a47ba09 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.undeleted.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) + @pools = Pool.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 56c050f94..386fc1413 100644 --- a/app/models/pool.rb +++ b/app/models/pool.rb @@ -84,6 +84,12 @@ class Pool < ActiveRecord::Base q = q.collection end + if params[:is_deleted] == "true" + q = q.deleted + else + q = q.undeleted + end + q end end diff --git a/app/views/pools/index.html.erb b/app/views/pools/index.html.erb index 80037cc4d..ad391082f 100644 --- a/app/views/pools/index.html.erb +++ b/app/views/pools/index.html.erb @@ -17,6 +17,9 @@