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

fix: #7826, fix order of categories on recent dropdown

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-08-08 12:11:13 -04:00
parent cbede89af3
commit 3ecac97d7e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/helpers.js
View File

@@ -273,7 +273,7 @@ function getCategoryData(cids, uid, selectedCid, callback) {
}
async.waterfall([
function (next) {
categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'link', 'color', 'bgColor', 'parentCid', 'image', 'imageClass'], next);
categories.getCategoriesFields(cids, ['cid', 'order', 'name', 'slug', 'icon', 'link', 'color', 'bgColor', 'parentCid', 'image', 'imageClass'], next);
},
function (categoryData, next) {
categoryData = categoryData.filter(category => category && !category.link);

6
src/user/categories.js
View File

@@ -49,9 +49,9 @@ module.exports = function (User) {
if (!(parseInt(uid, 10) > 0)) {
return await categories.getAllCidsFromSet('categories:cid');
}
const userState = await User.getCategoryWatchState(uid);
const cids = Object.keys(userState);
return cids.filter(cid => states.includes(userState[cid]));
const cids = await categories.getAllCidsFromSet('categories:cid');
const userState = await categories.getWatchState(cids, uid);
return cids.filter((cid, index) => states.includes(userState[index]));
};
User.ignoreCategory = async function (uid, cid) {