IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Next pages were missing on <noscript> content. Also fixed some long standing bugs.

Browse Source
This commit is contained in:
Robin Ward
2013-07-05 14:45:54 -04:00
parent 2e7eee7ebd
commit 4c90b16681
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/topic_view.rb
View File

@@ -21,7 +21,8 @@ class TopicView
guardian.ensure_can_see!(@topic)
@post_number, @page = options[:post_number], options[:page]
@post_number, @page = options[:post_number], options[:page].to_i
@page = 1 if @page == 0
@limit = options[:limit] || SiteSetting.posts_per_page;
@@ -56,10 +57,16 @@ class TopicView
path
end
def last_post
return nil if @posts.blank?
@last_post ||= @posts.last
end
def next_page
last_post = @filtered_posts.last
if last_post.present? && (@topic.highest_post_number > last_post.post_number)
(@filtered_posts[0].post_number / SiteSetting.posts_per_page) + 1
@next_page ||= begin
if last_post && (@topic.highest_post_number > last_post.post_number)
@page + 1
end
end
end
@@ -142,7 +149,8 @@ class TopicView
def filter_posts_paged(page)
page = [page, 1].max
min = SiteSetting.posts_per_page * (page - 1)
max = min + SiteSetting.posts_per_page
max = (min + SiteSetting.posts_per_page) - 1
filter_posts_in_range(min, max)
end