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

closes #3762

Browse Source
This commit is contained in:
barisusakli
2016-09-19 13:08:31 +03:00
parent 2ac3f5e392
commit 958fe3e72f
5 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/controllers/category.js
View File

@@ -20,6 +20,7 @@ categoryController.get = function(req, res, callback) {
var currentPage = parseInt(req.query.page, 10) || 1;
var pageCount = 1;
var userPrivileges;
var settings;
if ((req.params.topic_index && !utils.isNumber(req.params.topic_index)) || !utils.isNumber(cid)) {
return callback();
@@ -54,7 +55,7 @@ categoryController.get = function(req, res, callback) {
return helpers.redirect(res, '/category/' + results.categoryData.slug);
}
var settings = results.userSettings;
settings = results.userSettings;
var topicIndex = utils.isNumber(req.params.topic_index) ? parseInt(req.params.topic_index, 10) - 1 : 0;
var topicCount = parseInt(results.categoryData.topic_count, 10);
pageCount = Math.max(1, Math.ceil(topicCount / settings.topicsPerPage));
@@ -89,7 +90,7 @@ categoryController.get = function(req, res, callback) {
var start = (currentPage - 1) * settings.topicsPerPage + topicIndex;
var stop = start + settings.topicsPerPage - 1;
next(null, {
var payload = {
cid: cid,
set: set,
reverse: reverse,
@@ -97,19 +98,24 @@ categoryController.get = function(req, res, callback) {
stop: stop,
uid: req.uid,
settings: settings
});
},
function (payload, next) {
user.getUidByUserslug(req.query.author, function(err, uid) {
payload.targetUid = uid;
if (uid) {
payload.set = 'cid:' + cid + ':uid:' + uid + ':tids';
};
async.waterfall([
function(next) {
user.getUidByUserslug(req.query.author, next);
},
function(uid, next) {
payload.targetUid = uid;
if (uid) {
payload.set = 'cid:' + cid + ':uid:' + uid + ':tids';
}
if (req.query.tag) {
payload.set = [payload.set, 'tag:' + req.query.tag + ':topics'];
}
categories.getCategoryById(payload, next);
}
next(err, payload);
});
},
function (payload, next) {
categories.getCategoryById(payload, next);
], next);
},
function (categoryData, next) {
@@ -190,9 +196,14 @@ categoryController.get = function(req, res, callback) {
}
];
if (parseInt(req.uid, 10)) {
categories.markAsRead([cid], req.uid);
}
categoryData['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
categoryData.rssFeedUrl = nconf.get('relative_path') + '/category/' + categoryData.cid + '.rss';
categoryData.title = categoryData.name;
pageCount = Math.max(1, Math.ceil(categoryData.topic_count / settings.topicsPerPage));
categoryData.pagination = pagination.create(currentPage, pageCount, req.query);
categoryData.pagination.rel.forEach(function(rel) {
rel.href = nconf.get('url') + '/category/' + categoryData.slug + rel.href;