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

closes #1577

Browse Source
This commit is contained in:
barisusakli
2014-05-27 14:53:47 -04:00
parent 667a78902e
commit eb0a06b777
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/src/forum/topic/events.js
View File

@@ -113,8 +113,18 @@ define(['forum/topic/browsing', 'forum/topic/postTools', 'forum/topic/threadTool
if (postEl.length) { if (postEl.length) {
postEl.toggleClass('deleted'); postEl.toggleClass('deleted');
var isDeleted = postEl.hasClass('deleted');
postTools.toggle(data.pid, isDeleted);
postTools.toggle(data.pid, postEl.hasClass('deleted')); if (!app.isAdmin && parseInt(data.uid, 10) !== parseInt(app.uid, 10)) {
if (isDeleted) {
translator.translate('[[topic:post_is_deleted]]', function(translated) {
postEl.find('.post-content').html(translated);
});
} else {
postEl.find('.post-content').html(data.content);
}
}
postTools.updatePostCount(); postTools.updatePostCount();
} }

13
src/postTools.js
View File

@@ -146,7 +146,7 @@ var winston = require('winston'),
db.incrObjectFieldBy('global', 'postCount', isDelete ? -1 : 1); db.incrObjectFieldBy('global', 'postCount', isDelete ? -1 : 1);
posts.getPostFields(pid, ['tid', 'uid', 'content'], function(err, postData) { posts.getPostFields(pid, ['pid', 'tid', 'uid', 'content'], function(err, postData) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -170,7 +170,16 @@ var winston = require('winston'),
function(next) { function(next) {
addOrRemoveFromCategoryRecentPosts(pid, postData.tid, isDelete, next); addOrRemoveFromCategoryRecentPosts(pid, postData.tid, isDelete, next);
} }
], callback); ], function(err) {
if (!isDelete) {
PostTools.parse(postData.content, function(err, parsed) {
postData.content = parsed;
callback(err, postData);
});
return;
}
callback(err, postData);
});
}); });
}); });
}); });

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

@@ -188,7 +188,7 @@ function deleteOrRestore(command, socket, data, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
postTools[command](socket.uid, data.pid, function(err) { postTools[command](socket.uid, data.pid, function(err, postData) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
@@ -196,9 +196,7 @@ function deleteOrRestore(command, socket, data, callback) {
module.parent.exports.emitTopicPostStats(); module.parent.exports.emitTopicPostStats();
var eventName = command === 'restore' ? 'event:post_restored' : 'event:post_deleted'; var eventName = command === 'restore' ? 'event:post_restored' : 'event:post_deleted';
websockets.server.sockets.in('topic_' + data.tid).emit(eventName, { websockets.server.sockets.in('topic_' + data.tid).emit(eventName, postData);
pid: data.pid
});
callback(); callback();
}); });