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

#2886 Check subcategories when showing category recent topics

Browse Source
This commit is contained in:
EvSpirit
2015-03-24 21:39:28 +03:00
parent 11710987a4
commit 0fcd4dee58
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/categories/recentreplies.js
View File

@@ -61,7 +61,8 @@ module.exports = function(Categories) {
function assignPostsToCategory(category, posts) { function assignPostsToCategory(category, posts) {
category.posts = posts.filter(function(post) { category.posts = posts.filter(function(post) {
return post.category && parseInt(post.category.cid, 10) === parseInt(category.cid, 10); return !!(post.category && (parseInt(post.category.cid, 10) === parseInt(category.cid, 10)
) || (parseInt(post.category.parentCid, 10) === parseInt(category.cid, 10)));
}).sort(function(a, b) { }).sort(function(a, b) {
return b.timestamp - a.timestamp; return b.timestamp - a.timestamp;
}).slice(0, parseInt(category.numRecentReplies, 10)); }).slice(0, parseInt(category.numRecentReplies, 10));

2
src/posts/summary.js
View File

@@ -120,7 +120,7 @@ module.exports = function(Posts) {
return topic && array.indexOf(topic) === index; return topic && array.indexOf(topic) === index;
}); });
categories.getMultipleCategoryFields(cids, ['cid', 'name', 'icon', 'slug'], function(err, categories) { categories.getMultipleCategoryFields(cids, ['cid', 'name', 'icon', 'slug', 'parentCid'], function(err, categories) {
callback(err, {topics: topics, categories: categories}); callback(err, {topics: topics, categories: categories});
}); });
}); });