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

pools/gallery: allow searching for collection pools (#3992).

Browse Source 
Default to showing only series pools when not doing a search. Otherwise,
when doing a search, show both series and collection pools.
This commit is contained in:
evazion
2018-11-15 11:38:35 -06:00
parent 4fcb82f2e6
commit 29fdfc42a4
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/pools_controller.rb
View File

@@ -30,8 +30,10 @@ class PoolsController < ApplicationController
end
def gallery
limit = params[:limit] || CurrentUser.user.per_page
@pools = Pool.series.search(search_params).reorder("updated_at desc").paginate(params[:page], :limit => limit, :search_count => params[:search])
params[:limit] ||= CurrentUser.user.per_page
search = search_params.presence || ActionController::Parameters.new(category: "series")
@pools = Pool.search(search).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
@post_set = PostSets::PoolGallery.new(@pools)
end

20
app/views/pools/_search.html.erb
View File

@@ -37,22 +37,20 @@
</td>
</tr>
<% if path != gallery_pools_path %>
<tr>
<th><label for="search_category">Category</th>
<td>
<div class="input">
<%= select "search", "category", [["Series", "series"], ["Collection", "collection"]], :selected => params[:search][:category], :include_blank => true %>
</div>
</td>
</tr>
<% end %>
<tr>
<th><label for="search_category">Category</th>
<td>
<div class="input">
<%= select "search", "category", [["Series", "series"], ["Collection", "collection"]], :selected => params[:search][:category], :include_blank => true %>
</div>
</td>
</tr>
<tr>
<th><label for="search_order">Order</th>
<td>
<div class="input">
<%= select "search", "order", [["Last updated", "updated_at"], ["Name", "name"], ["Recently created", "created_at"], ["Post count", "post_count"]], :selected => params[:search][:order] %>
<%= select "search", "order", [["Last updated", "updated_at"], ["Name", "name"], ["Recently created", "created_at"], ["Post count", "post_count"]], :selected => params[:search][:order], :include_blank => true %>
</div>
</td>
</tr>