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

/forum_topics: fix default limit being ignored.

Browse Source
This commit is contained in:
evazion
2019-10-08 00:00:16 -05:00
parent cd47987b05
commit 3955c3fc8d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/forum_topics_controller.rb
View File

@@ -22,6 +22,7 @@ class ForumTopicsController < ApplicationController
def index def index
params[:search] ||= {} params[:search] ||= {}
params[:search][:order] ||= "sticky" if request.format == Mime::Type.lookup("text/html") params[:search][:order] ||= "sticky" if request.format == Mime::Type.lookup("text/html")
params[:limit] ||= 40
@forum_topics = ForumTopic.active.paginated_search(params) @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, :updater).load if request.format.html?
@@ -99,10 +100,6 @@ class ForumTopicsController < ApplicationController
end end
private private
def per_page
params[:limit] || 40
end
def normalize_search def normalize_search
if params[:title_matches] if params[:title_matches]
params[:search] ||= {} params[:search] ||= {}