Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-09 16:45:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: returned fields

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-09-20 22:10:08 -04:00
parent 90f8bb99c0
commit 86b16629f8
7 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/categories.js
View File

@@ -13,7 +13,7 @@ categoriesController.get = async function (req, res, next) {
}
const [states, categoriesData] = await Promise.all([
user.getCategoryWatchState(userData.uid),
categories.buildForSelect(userData.uid, 'find'),
categories.buildForSelect(userData.uid, 'find', ['descriptionParsed', 'depth']),
]);
categoriesData.forEach(function (category) {

2
src/controllers/admin/admins-mods.js
View File

@@ -22,7 +22,7 @@ AdminsMods.get = async function (req, res) {
};
async function getModeratorsOfCategories(uid) {
const categoryData = await categories.buildForSelect(uid, 'find');
const categoryData = await categories.buildForSelect(uid, 'find', ['depth']);
const moderators = await Promise.all(categoryData.map(c => categories.getModerators(c.cid)));
categoryData.forEach((c, index) => {
c.moderators = moderators[index];

4
src/controllers/admin/categories.js
View File

@@ -11,7 +11,7 @@ categoriesController.get = async function (req, res, next) {
const [categoryData, parent, allCategories] = await Promise.all([
categories.getCategories([req.params.category_id], req.uid),
categories.getParents([req.params.category_id]),
categories.buildForSelectAll(req.uid),
categories.buildForSelectAll(['text', 'value']),
]);
const category = categoryData[0];
@@ -22,7 +22,7 @@ categoriesController.get = async function (req, res, next) {
category.parent = parent[0];
allCategories.forEach(function (category) {
if (category) {
category.selected = parseInt(category.cid, 10) === parseInt(req.params.category_id, 10);
category.selected = parseInt(category.value, 10) === parseInt(req.params.category_id, 10);
}
});

2
src/controllers/admin/privileges.js
View File

@@ -9,7 +9,7 @@ privilegesController.get = async function (req, res) {
const cid = req.params.cid ? parseInt(req.params.cid, 10) : 0;
const [privilegesData, categoriesData] = await Promise.all([
cid ? privileges.categories.list(cid) : privileges.global.list(),
categories.buildForSelectAll(req.uid),
categories.buildForSelectAll(),
]);
categoriesData.unshift({

3
src/controllers/search.js
View File

@@ -89,8 +89,7 @@ async function buildCategories(uid, searchOnly) {
let categoriesData = await categories.getCategoriesData(cids);
categoriesData = categoriesData.filter(category => category && !category.link);
categoriesData = categories.getTree(categoriesData);
categoriesData = categories.buildForSelectCategories(categoriesData);
categoriesData = categoriesData.map(category => ({ value: category.value, text: category.text }));
categoriesData = categories.buildForSelectCategories(categoriesData, ['text', 'value']);
return [
{ value: 'all', text: '[[unread:all_categories]]' },