Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

#5223

Browse Source 
adjust pagination so each page shows `postsPerPage` posts
This commit is contained in:
barisusakli
2016-11-21 13:49:36 +03:00
parent db14c29e41
commit b49af0a135
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/topics.js
View File

@@ -66,7 +66,7 @@ topicsController.get = function (req, res, callback) {
settings = results.settings; settings = results.settings;
var postCount = parseInt(results.topic.postcount, 10); var postCount = parseInt(results.topic.postcount, 10);
pageCount = Math.max(1, Math.ceil((postCount - 1) / settings.postsPerPage)); pageCount = Math.max(1, Math.ceil(postCount / settings.postsPerPage));
if (utils.isNumber(req.params.post_index) && (req.params.post_index < 1 || req.params.post_index > postCount)) { if (utils.isNumber(req.params.post_index) && (req.params.post_index < 1 || req.params.post_index > postCount)) {
return helpers.redirect(res, '/topic/' + req.params.topic_id + '/' + req.params.slug + (req.params.post_index > postCount ? '/' + postCount : '')); return helpers.redirect(res, '/topic/' + req.params.topic_id + '/' + req.params.slug + (req.params.post_index > postCount ? '/' + postCount : ''));

5
src/topics.js
View File

@@ -234,6 +234,10 @@ var social = require('./social');
function getMainPostAndReplies(topic, set, uid, start, stop, reverse, callback) { function getMainPostAndReplies(topic, set, uid, start, stop, reverse, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {
if (start > 0 && stop > 0) {
start--;
stop--;
}
posts.getPidsFromSet(set, start, stop, reverse, next); posts.getPidsFromSet(set, start, stop, reverse, next);
}, },
function (pids, next) { function (pids, next) {
@@ -243,6 +247,7 @@ var social = require('./social');
if (topic.mainPid && start === 0) { if (topic.mainPid && start === 0) {
pids.unshift(topic.mainPid); pids.unshift(topic.mainPid);
pids.pop();
} }
posts.getPostsByPids(pids, uid, next); posts.getPostsByPids(pids, uid, next);
}, },