diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb index 610c22c7e..0e039f422 100644 --- a/app/controllers/pools_controller.rb +++ b/app/controllers/pools_controller.rb @@ -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 diff --git a/app/views/pools/_search.html.erb b/app/views/pools/_search.html.erb index b334c957f..d5a8401f2 100644 --- a/app/views/pools/_search.html.erb +++ b/app/views/pools/_search.html.erb @@ -37,22 +37,20 @@ - <% if path != gallery_pools_path %> -