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

modifyCategory is no longer async

Browse Source
This commit is contained in:
barisusakli
2015-10-27 17:21:28 -04:00
parent 96befd02ad
commit 290686a194
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/categories/data.js
View File

@@ -5,13 +5,17 @@ var validator = require('validator');
var winston = require('winston'); var winston = require('winston');
var db = require('../database'); var db = require('../database');
var plugins = require('../plugins');
module.exports = function(Categories) { module.exports = function(Categories) {
Categories.getCategoryData = function(cid, callback) { Categories.getCategoryData = function(cid, callback) {
Categories.getCategoriesData([cid], function(err, categories) { db.getObject('category:' + cid, function(err, category) {
callback(err, categories ? categories[0] : null); if (err) {
return callback(err);
}
modifyCategory(category);
callback(null, category);
}); });
}; };
@@ -28,13 +32,14 @@ module.exports = function(Categories) {
return callback(err, []); return callback(err, []);
} }
async.map(categories, modifyCategory, callback); categories.forEach(modifyCategory);
callback(null, categories);
}); });
}; };
function modifyCategory(category, callback) { function modifyCategory(category) {
if (!category) { if (!category) {
return callback(null, null); return;
} }
category.name = validator.escape(category.name); category.name = validator.escape(category.name);
@@ -56,8 +61,6 @@ module.exports = function(Categories) {
category.description = validator.escape(category.description); category.description = validator.escape(category.description);
category.descriptionParsed = category.descriptionParsed || category.description; category.descriptionParsed = category.descriptionParsed || category.description;
} }
callback(null, category);
} }
Categories.getCategoryField = function(cid, field, callback) { Categories.getCategoryField = function(cid, field, callback) {
@@ -77,7 +80,9 @@ module.exports = function(Categories) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
async.map(categories, modifyCategory, callback);
categories.forEach(modifyCategory);
callback(null, categories);
}); });
}; };