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

closes #3720

Browse Source
This commit is contained in:
barisusakli
2015-10-07 16:13:37 -04:00
parent 01a0f09e9c
commit 2d96cdba1c
10 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/controllers/topics.js
View File

@@ -18,6 +18,8 @@ var topicsController = {},
topicsController.get = function(req, res, callback) {
var tid = req.params.topic_id,
sort = req.query.sort,
currentPage = parseInt(req.query.page, 10) || 1,
pageCount = 1,
userPrivileges;
if ((req.params.post_index && !utils.isNumber(req.params.post_index)) || !utils.isNumber(tid)) {
@@ -56,14 +58,13 @@ topicsController.get = function(req, res, callback) {
var settings = results.settings;
var postCount = parseInt(results.topic.postcount, 10);
var pageCount = Math.max(1, Math.ceil((postCount - 1) / settings.postsPerPage));
var page = parseInt(req.query.page, 10) || 1;
pageCount = Math.max(1, Math.ceil((postCount - 1) / settings.postsPerPage));
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 : ''));
}
if (settings.usePagination && (page < 1 || page > pageCount)) {
if (settings.usePagination && (currentPage < 1 || currentPage > pageCount)) {
return callback();
}
@@ -105,10 +106,10 @@ topicsController.get = function(req, res, callback) {
index = Math.max(0, req.params.post_index - 1) || 0;
}
page = Math.max(1, Math.ceil(index / settings.postsPerPage));
currentPage = Math.max(1, Math.ceil(index / settings.postsPerPage));
}
var start = (page - 1) * settings.postsPerPage + postIndex,
var start = (currentPage - 1) * settings.postsPerPage + postIndex,
stop = start + settings.postsPerPage - 1;
topics.getTopicWithPosts(tid, set, req.uid, start, stop, reverse, function (err, topicData) {
@@ -120,9 +121,6 @@ topicsController.get = function(req, res, callback) {
return next(err);
}
topicData.pageCount = pageCount;
topicData.currentPage = page;
topics.modifyByPrivilege(topicData.posts, results.privileges);
plugins.fireHook('filter:controllers.topic.get', topicData, next);
@@ -261,7 +259,7 @@ topicsController.get = function(req, res, callback) {
data['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
data.rssFeedUrl = nconf.get('relative_path') + '/topic/' + data.tid + '.rss';
data.pagination = pagination.create(data.currentPage, data.pageCount);
data.pagination = pagination.create(currentPage, pageCount);
data.pagination.rel.forEach(function(rel) {
rel.href = nconf.get('url') + '/topic/' + data.slug + rel.href;
res.locals.linkTags.push(rel);