Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved notFound notAllowed to helpers

Browse Source
This commit is contained in:
barisusakli
2014-11-15 23:22:57 -05:00
parent f8cfd82667
commit 556e7066e8
5 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/controllers/topics.js
View File

@@ -11,7 +11,7 @@ var topicsController = {},
topics = require('../topics'),
posts = require('../posts'),
privileges = require('../privileges'),
categoriesController = require('./categories'),
helpers = require('./helpers'),
utils = require('../../public/src/utils');
topicsController.get = function(req, res, next) {
@@ -22,7 +22,7 @@ topicsController.get = function(req, res, next) {
userPrivileges;
if (req.params.post_index && !utils.isNumber(req.params.post_index)) {
return categoriesController.notFound(req, res);
return helpers.notFound(res);
}
async.waterfall([
@@ -43,15 +43,15 @@ topicsController.get = function(req, res, next) {
userPrivileges = results.privileges;
if (userPrivileges.disabled) {
return categoriesController.notFound(req, res);
return helpers.notFound(res);
}
if (tid + '/' + req.params.slug !== results.topic.slug) {
return categoriesController.notFound(req, res);
return helpers.notFound(res);
}
if (!userPrivileges.read) {
return categoriesController.notAllowed(req, res);
return helpers.notAllowed(req, res);
}
var settings = results.settings;
@@ -67,7 +67,7 @@ topicsController.get = function(req, res, next) {
}
if (settings.usePagination && (req.query.page < 1 || req.query.page > pageCount)) {
return categoriesController.notFound(req, res);
return helpers.notFound(res);
}
var set = 'tid:' + tid + ':posts',
@@ -110,13 +110,13 @@ topicsController.get = function(req, res, next) {
topics.getTopicWithPosts(tid, set, uid, start, end, reverse, function (err, topicData) {
if (err && err.message === '[[error:no-topic]]' && !topicData) {
return categoriesController.notFound(req, res);
return helpers.notFound(res);
}
if (err && !topicData) {
return next(err);
}
if (topicData.deleted && !userPrivileges.view_deleted) {
return categoriesController.notAllowed(req, res);
return helpers.notAllowed(req, res);
}
topicData.pageCount = pageCount;