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

more work on #1518

Browse Source 
still needs more work, category is next
This commit is contained in:
barisusakli
2014-05-15 10:38:02 -04:00
parent 822cf56af1
commit 3e86bdb38f
15 changed files with 272 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/controllers/topics.js
View File

@@ -10,27 +10,27 @@ var topicsController = {},
meta = require('./../meta'),
topics = require('./../topics'),
posts = require('../posts'),
threadTools = require('./../threadTools'),
privileges = require('../privileges'),
utils = require('./../../public/src/utils');
topicsController.get = function(req, res, next) {
var tid = req.params.topic_id,
page = req.query.page || 1,
uid = req.user ? req.user.uid : 0,
privileges;
userPrivileges;
async.waterfall([
function(next) {
threadTools.privileges(tid, uid, function(err, userPrivileges) {
privileges.topics.get(tid, uid, function(err, privileges) {
if (err) {
return next(err);
}
if (!userPrivileges.meta.read) {
if (!privileges.meta.read) {
return next(new Error('[[error:no-privileges]]'));
}
privileges = userPrivileges;
userPrivileges = privileges;
next();
});
},
@@ -45,7 +45,7 @@ topicsController.get = function(req, res, next) {
topics.getTopicWithPosts(tid, uid, start, end, function (err, topicData) {
if (topicData) {
if (parseInt(topicData.deleted, 10) === 1 && parseInt(topicData.expose_tools, 10) === 0) {
if (parseInt(topicData.deleted, 10) === 1 && !userPrivileges.view_deleted) {
return next(new Error('[[error:no-topic]]'));
}
topicData.currentPage = page;
@@ -154,7 +154,7 @@ topicsController.get = function(req, res, next) {
}
}
data.privileges = privileges;
data.privileges = userPrivileges;
var topic_url = tid + (req.params.slug ? '/' + req.params.slug : '');
var queryString = qs.stringify(req.query);