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

Merge remote-tracking branch 'origin/0.5.1' into hashtalk

Browse Source
This commit is contained in:
barisusakli
2014-09-15 14:36:27 -04:00
parent 7c3dc4877a 84d4035597
commit da86c46b4c
212 changed files with 833 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/categories.js
View File

@@ -372,7 +372,7 @@ var db = require('./database'),
if (categories[i]) {
categories[i]['unread-class'] = (parseInt(categories[i].topic_count, 10) === 0 || (hasRead[i] && uid !== 0)) ? '' : 'unread';
categories[i].children = results.children[i];
categories[i].parent = results.parents[i];
categories[i].parent = results.parents[i] && !results.parents[i].disabled ? results.parents[i] : null;
}
}
@@ -408,9 +408,10 @@ var db = require('./database'),
Categories.getCategoriesData(cids, next);
},
function (categories, next) {
// Filter categories to isolate children, and remove disabled categories
async.map(cids, function(cid, next) {
next(null, categories.filter(function(category) {
return parseInt(category.parentCid, 10) === parseInt(cid, 10);
return parseInt(category.parentCid, 10) === parseInt(cid, 10) && !category.disabled;
}));
}, next);
}