jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1946

Browse Source
This commit is contained in:
Toks
2013-08-18 18:24:10 -04:00
parent dc180899f5
commit b32783c8ba
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pool_elements_controller.rb
View File

@@ -22,7 +22,7 @@ class PoolElementsController < ApplicationController
end end
def all_select 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 end
private private

2
app/controllers/pools_controller.rb
View File

@@ -14,7 +14,7 @@ class PoolsController < ApplicationController
end end
def index 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| respond_with(@pools) do |format|
format.xml do format.xml do
render :xml => @pools.to_xml(:root => "pools") render :xml => @pools.to_xml(:root => "pools")

2
app/models/pool.rb
View File

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