fixes #1946
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user