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

closes #1518

Browse Source
This commit is contained in:
barisusakli
2014-05-15 20:49:47 -04:00
parent 033364a2a9
commit b1aae05a08
19 changed files with 166 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/controllers/categories.js
View File

@@ -4,7 +4,7 @@ var categoriesController = {},
async = require('async'),
qs = require('querystring'),
nconf = require('nconf'),
categoryTools = require('./../categoryTools'),
privileges = require('../privileges'),
user = require('./../user'),
categories = require('./../categories'),
topics = require('./../topics');
@@ -72,16 +72,16 @@ categoriesController.get = function(req, res, next) {
});
},
function(next) {
categoryTools.privileges(cid, uid, function(err, categoryPrivileges) {
privileges.categories.get(cid, uid, function(err, categoryPrivileges) {
if (err) {
return next(err);
}
if (!categoryPrivileges.meta.read) {
next(new Error('[[error:no-privileges]]'));
} else {
next(null, categoryPrivileges);
return next(new Error('[[error:no-privileges]]'));
}
next(null, categoryPrivileges);
});
},
function (privileges, next) {
@@ -152,14 +152,14 @@ categoriesController.get = function(req, res, next) {
}
], function (err, data) {
if (err) {
if (err.message === 'not-enough-privileges') {
return res.redirect('403');
if (err.message === '[[error:no-privileges]]') {
return res.locals.isAPI ? res.json(403, err.message) : res.redirect('403');
} else {
return res.redirect('404');
return res.locals.isAPI ? res.json(404, 'not-found') : res.redirect('404');
}
}
if(data.link) {
if (data.link) {
return res.redirect(data.link);
}