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

closes #6579

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-06-18 14:37:32 -04:00
parent ed4787a3ea
commit ccad95cf73
19 changed files with 188 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/unread.js
View File

@@ -18,7 +18,7 @@ unreadController.get = function (req, res, next) {
var page = parseInt(req.query.page, 10) || 1;
var results;
var cid = req.query.cid;
var filter = req.params.filter || '';
var filter = req.query.filter || '';
var settings;
async.waterfall([
@@ -71,6 +71,7 @@ unreadController.get = function (req, res, next) {
}
data.categories = results.watchedCategories.categories;
data.allCategoriesUrl = 'unread' + helpers.buildQueryString('', filter, '');
data.selectedCategory = results.watchedCategories.selectedCategory;
data.selectedCids = results.watchedCategories.selectedCids;
if (req.originalUrl.startsWith(nconf.get('relative_path') + '/api/unread') || req.originalUrl.startsWith(nconf.get('relative_path') + '/unread')) {
@@ -78,20 +79,19 @@ unreadController.get = function (req, res, next) {
data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[unread:title]]' }]);
}
data.filters = helpers.buildFilters('unread', filter);
data.filters = helpers.buildFilters('unread', filter, req.query);
data.selectedFilter = data.filters.find(function (filter) {
return filter && filter.selected;
});
data.querystring = cid ? '?' + querystring.stringify({ cid: cid }) : '';
res.render('unread', data);
},
], next);
};
unreadController.unreadTotal = function (req, res, next) {
var filter = req.params.filter || '';
var filter = req.query.filter || '';
async.waterfall([
function (next) {