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

reverting some of my code and fixed #1322 properly

Browse Source
This commit is contained in:
barisusakli
2014-04-02 13:58:10 -04:00
parent 682fa1f874
commit bdefebeea0
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -755,8 +755,17 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools'],
} }
function onNewPostsLoaded(html, posts) { function onNewPostsLoaded(html, posts) {
function getPostPrivileges(pid) {
socket.emit('posts.getPrivileges', pid, function(err, privileges) {
if(err) {
return app.alertError(err.message);
}
toggle_mod_tools(html, privileges);
});
}
for (var x = 0, numPosts = posts.length; x < numPosts; x++) { for (var x = 0, numPosts = posts.length; x < numPosts; x++) {
toggle_mod_tools(posts[x].pid, posts[x].display_moderator_tools); getPostPrivileges(posts[x].pid);
} }
infiniteLoaderActive = false; infiniteLoaderActive = false;
@@ -771,9 +780,9 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools'],
showBottomPostBar(); showBottomPostBar();
} }
function toggle_mod_tools(postHtml, privileges) {
function toggle_mod_tools(pid, editable) { postHtml.find('.edit, .delete').toggleClass('none', !privileges.editable);
$('#post-container li[data-pid="' + pid + '"]').find('.edit, .delete').toggleClass('none', !editable); postHtml.find('.move').toggleClass('none', !privileges.move);
} }
function updatePostCount() { function updatePostCount() {

10
src/socket.io/posts.js
View File

@@ -219,6 +219,16 @@ function deleteOrRestore(command, socket, data, callback) {
}); });
} }
SocketPosts.getPrivileges = function(socket, pid, callback) {
postTools.privileges(pid, socket.uid, function(err, privileges) {
if(err) {
return callback(err);
}
privileges.pid = parseInt(pid, 10);
callback(null, privileges);
});
};
SocketPosts.getFavouritedUsers = function(socket, pid, callback) { SocketPosts.getFavouritedUsers = function(socket, pid, callback) {
favourites.getFavouritedUidsByPids([pid], function(err, data) { favourites.getFavouritedUidsByPids([pid], function(err, data) {

4
src/topics/create.js
View File

@@ -222,8 +222,8 @@ module.exports = function(Topics) {
postData.index = index; postData.index = index;
postData.favourited = false; postData.favourited = false;
postData.votes = 0; postData.votes = 0;
postData.display_moderator_tools = false; postData.display_moderator_tools = true;
postData.display_move_tools = false; postData.display_move_tools = privileges.admin || privileges.moderator;
postData.relativeTime = utils.toISOString(postData.timestamp); postData.relativeTime = utils.toISOString(postData.timestamp);
next(null, postData); next(null, postData);