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

closes #4713

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2016-06-09 14:29:54 +03:00
parent 8a8e4062e2
commit ae19f0ff7d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/unread.js
View File

@@ -2,6 +2,7 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var querystring = require('querystring');
var categories = require('../categories'); var categories = require('../categories');
var privileges = require('../privileges'); var privileges = require('../privileges');
@@ -47,6 +48,14 @@ unreadController.get = function(req, res, next) {
return next(err); return next(err);
} }
data.pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage));
data.pagination = pagination.create(page, data.pageCount, req.query);
if (settings.usePagination && (page < 1 || page > data.pageCount)) {
req.query.page = Math.max(1, Math.min(data.pageCount, page));
return helpers.redirect(res, '/unread?' + querystring.stringify(req.query));
}
data.categories = results.watchedCategories.categories; data.categories = results.watchedCategories.categories;
data.selectedCategory = results.watchedCategories.selectedCategory; data.selectedCategory = results.watchedCategories.selectedCategory;
@@ -75,9 +84,6 @@ unreadController.get = function(req, res, next) {
data.querystring = req.query.cid ? ('?cid=' + req.query.cid) : ''; data.querystring = req.query.cid ? ('?cid=' + req.query.cid) : '';
data.pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage));
data.pagination = pagination.create(page, data.pageCount, req.query);
res.render('unread', data); res.render('unread', data);
}); });
}; };