Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 16:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1555

Browse Source
This commit is contained in:
barisusakli
2014-05-22 14:56:15 -04:00
parent fa1275c03a
commit b8b482e287
8 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/forum/topic.js
View File

@@ -351,8 +351,8 @@ define(['forum/pagination', 'forum/infinitescroll', 'forum/topic/threadTools', '
}
function toggleModTools(postHtml, privileges) {
postHtml.find('.edit, .delete').toggleClass('none', !privileges.meta.editable);
postHtml.find('.move').toggleClass('none', !privileges.meta.move);
postHtml.find('.edit, .delete').toggleClass('none', !privileges.editable);
postHtml.find('.move').toggleClass('none', !privileges.move);
postHtml.find('.reply, .quote').toggleClass('none', !$('.post_reply').length);
var isSelfPost = parseInt(postHtml.attr('data-uid'), 10) === parseInt(app.uid, 10);
postHtml.find('.chat, .flag').toggleClass('none', isSelfPost);

2
src/controllers/categories.js
View File

@@ -77,7 +77,7 @@ categoriesController.get = function(req, res, next) {
return next(err);
}
if (!categoryPrivileges.meta.read) {
if (!categoryPrivileges.read) {
return next(new Error('[[error:no-privileges]]'));
}

4
src/controllers/topics.js
View File

@@ -26,7 +26,7 @@ topicsController.get = function(req, res, next) {
return next(err);
}
if (!privileges.meta.read) {
if (!privileges.read) {
return next(new Error('[[error:no-privileges]]'));
}
@@ -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 && !userPrivileges.meta.view_deleted) {
if (parseInt(topicData.deleted, 10) === 1 && !userPrivileges.view_deleted) {
return next(new Error('[[error:no-topic]]'));
}
topicData.currentPage = page;

2
src/privileges/categories.js
View File

@@ -34,12 +34,10 @@ module.exports = function(privileges) {
var editable = results.isAdministrator || results.isModerator;
callback(null, {
meta: {
'topics:create': results['topics:create'],
editable: editable,
view_deleted: editable,
read: results.read
}
});
});
};

2
src/privileges/posts.js
View File

@@ -44,11 +44,9 @@ module.exports = function(privileges) {
var editable = results.isAdministrator || results.isModerator || results.manage_content || results.manage_topic || results.isOwner;
callback(null, {
meta: {
editable: editable,
view_deleted: editable,
move: results.isAdministrator || results.isModerator
}
});
});
};

2
src/privileges/topics.js
View File

@@ -44,12 +44,10 @@ module.exports = function(privileges) {
var editable = results.isAdministrator || results.isModerator || results.manage_topic;
callback(null, {
meta: {
'topics:reply': results['topics:reply'],
editable: editable,
view_deleted: editable,
read: results.read
}
});
});
});

2
src/topics.js
View File

@@ -184,7 +184,7 @@ var async = require('async'),
function isTopicVisible(topicData, topicInfo) {
var deleted = parseInt(topicData.deleted, 10) !== 0;
return !deleted || (deleted && topicInfo.privileges.meta.view_deleted) || parseInt(topicData.uid, 10) === parseInt(uid, 10);
return !deleted || (deleted && topicInfo.privileges.view_deleted) || parseInt(topicData.uid, 10) === parseInt(uid, 10);
}
async.parallel({

6
src/topics/posts.js
View File

@@ -64,11 +64,11 @@ module.exports = function(Topics) {
postData[i].upvoted = results.voteData[i].upvoted;
postData[i].downvoted = results.voteData[i].downvoted;
postData[i].votes = postData[i].votes || 0;
postData[i].display_moderator_tools = results.privileges[i].meta.editable;
postData[i].display_move_tools = results.privileges[i].meta.move;
postData[i].display_moderator_tools = results.privileges[i].editable;
postData[i].display_move_tools = results.privileges[i].move;
postData[i].selfPost = parseInt(uid, 10) === parseInt(postData[i].uid, 10);
if(postData[i].deleted && !results.privileges[i].meta.view_deleted) {
if(postData[i].deleted && !results.privileges[i].view_deleted) {
postData[i].content = '[[topic:post_is_deleted]]';
}
}