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

pagination: avoid counting pages outside searches.

Browse Source 
Replace this common pattern in controllers:

    @tags = Tag.search(search_params).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])

with this:

    @tags = Tag.paginated_search(params)

`search_count` is used to skip doing a full page count when we're not
doing a search (on the assumption that the number of results will be
high when not constrained by a search). We didn't do this consistently
though. Refactor to do this in every controller.
This commit is contained in:
evazion
2019-10-07 21:50:36 -05:00
parent 93dd952949
commit a5ab25d0ba
34 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/forum_topics_controller.rb
View File

@@ -23,8 +23,7 @@ class ForumTopicsController < ApplicationController
params[:search] ||= {}
params[:search][:order] ||= "sticky" if request.format == Mime::Type.lookup("text/html")
@query = ForumTopic.active.search(search_params)
@forum_topics = @query.paginate(params[:page], :limit => per_page, :search_count => params[:search])
@forum_topics = ForumTopic.active.paginated_search(params)
@forum_topics = @forum_topics.includes(:creator, :updater).load if request.format.html?
@forum_topics = @forum_topics.includes(:creator, :original_post).load if request.format.atom?