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

pools/show: fix pagination to respect user's posts-per-page setting.

Browse Source
This commit is contained in:
evazion
2019-08-21 14:31:58 -05:00
parent b283281e5e
commit 7cc31b97c9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/pools_controller.rb
View File

@@ -30,16 +30,18 @@ class PoolsController < ApplicationController
end end
def gallery def gallery
params[:limit] ||= CurrentUser.user.per_page limit = params[:limit].presence || CurrentUser.user.per_page
search = search_params.presence || ActionController::Parameters.new(category: "series") search = search_params.presence || ActionController::Parameters.new(category: "series")
@pools = Pool.search(search).paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) @pools = Pool.search(search).paginate(params[:page], limit: limit, search_count: params[:search])
@post_set = PostSets::PoolGallery.new(@pools) @post_set = PostSets::PoolGallery.new(@pools)
end end
def show def show
limit = params[:limit].presence || CurrentUser.user.per_page
@pool = Pool.find(params[:id]) @pool = Pool.find(params[:id])
@posts = @pool.posts.paginate(params[:page], limit: params[:limit], count: @pool.post_count) @posts = @pool.posts.paginate(params[:page], limit: limit, count: @pool.post_count)
respond_with(@pool) respond_with(@pool)
end end

2
app/views/pools/index.html.erb
View File

@@ -21,7 +21,7 @@
<span class="inactive">(deleted)</span> <span class="inactive">(deleted)</span>
<% end %> <% end %>
<% if pool.post_count > CurrentUser.user.per_page %> <% if pool.last_page > 1 %>
<%= link_to "page #{pool.last_page}", pool_path(pool, :page => pool.last_page), :class => "last-page" %> <%= link_to "page #{pool.last_page}", pool_path(pool, :page => pool.last_page), :class => "last-page" %>
<% end %> <% end %>
</td> </td>