From 2bc5605edcbd069ac6634a8a196ff5a2eb9415fd Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 1 Nov 2013 10:07:47 -0400 Subject: [PATCH] Allow searching for deleted pools --- app/controllers/pools_controller.rb | 2 +- app/models/pool.rb | 6 ++++++ app/views/pools/index.html.erb | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) 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 @@ <%= link_to pool.pretty_name, pool_path(pool) %> + <% if pool.is_deleted? %> + (deleted) + <% end %> <% if pool.post_count > CurrentUser.user.per_page %> <%= link_to "page #{pool.last_page}", pool_path(pool, :page => pool.last_page), :class => "last-page" %>