Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 17:00:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: page count for filters

Browse Source
This commit is contained in:
Baris Usakli
2019-08-30 12:32:21 -04:00
parent 547bb4966d
commit e291a60964
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/category.js
View File

@@ -47,7 +47,7 @@ categoryController.get = async function (req, res, next) {
if (topicIndex < 0 || topicIndex > Math.max(topicCount - 1, 0)) { if (topicIndex < 0 || topicIndex > Math.max(topicCount - 1, 0)) {
return helpers.redirect(res, '/category/' + cid + '/' + req.params.slug + (topicIndex > topicCount ? '/' + topicCount : '')); return helpers.redirect(res, '/category/' + cid + '/' + req.params.slug + (topicIndex > topicCount ? '/' + topicCount : ''));
} }
const pageCount = Math.max(1, Math.ceil(topicCount / userSettings.topicsPerPage)); let pageCount = Math.max(1, Math.ceil(topicCount / userSettings.topicsPerPage));
let currentPage = parseInt(req.query.page, 10) || 1; let currentPage = parseInt(req.query.page, 10) || 1;
if (userSettings.usePagination && (currentPage < 1 || currentPage > pageCount)) { if (userSettings.usePagination && (currentPage < 1 || currentPage > pageCount)) {
return next(); return next();
@@ -105,7 +105,7 @@ categoryController.get = async function (req, res, next) {
categoryData['feeds:disableRSS'] = meta.config['feeds:disableRSS']; categoryData['feeds:disableRSS'] = meta.config['feeds:disableRSS'];
categoryData['reputation:disabled'] = meta.config['reputation:disabled']; categoryData['reputation:disabled'] = meta.config['reputation:disabled'];
pageCount = Math.max(1, Math.ceil(categoryData.topic_count / userSettings.topicsPerPage));
categoryData.pagination = pagination.create(currentPage, pageCount, req.query); categoryData.pagination = pagination.create(currentPage, pageCount, req.query);
categoryData.pagination.rel.forEach(function (rel) { categoryData.pagination.rel.forEach(function (rel) {
rel.href = nconf.get('url') + '/category/' + categoryData.slug + rel.href; rel.href = nconf.get('url') + '/category/' + categoryData.slug + rel.href;