optimize getTopicsByTids and getTeasers

This commit is contained in:
barisusakli
2014-08-06 21:30:06 -04:00
parent c6ced111b5
commit 528ee335d5
8 changed files with 210 additions and 99 deletions

View File

@@ -74,22 +74,16 @@ categoriesController.get = function(req, res, next) {
},
function(disabled, next) {
if (parseInt(disabled, 10) === 1) {
return next(new Error('category-disabled'));
return next(new Error('[[error:category-disabled]]'));
}
privileges.categories.get(cid, uid, function(err, categoryPrivileges) {
if (err) {
return next(err);
}
if (!categoryPrivileges.read) {
return next(new Error('[[error:no-privileges]]'));
}
next(null, categoryPrivileges);
});
privileges.categories.get(cid, uid, next);
},
function (privileges, next) {
if (!privileges.read) {
return next(new Error('[[error:no-privileges]]'));
}
user.getSettings(uid, function(err, settings) {
if (err) {
return next(err);
@@ -111,12 +105,6 @@ categoriesController.get = function(req, res, next) {
return next(err);
}
if (categoryData) {
if (parseInt(categoryData.disabled, 10) === 1) {
return next(new Error('[[error:category-disabled]]'));
}
}
categoryData.privileges = privileges;
next(err, categoryData);
});
@@ -189,7 +177,6 @@ categoriesController.get = function(req, res, next) {
active: x === parseInt(page, 10)
});
}
res.render('category', data);
});
};