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

fix edit delete for rooms

Browse Source
This commit is contained in:
barisusakli
2015-12-17 12:05:35 +02:00
parent 992ca0a351
commit 3d79e0750b
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/client/chats.js
View File

@@ -68,7 +68,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
})
.on('click', '[data-action="delete"]', function() {
var messageId = $(this).parents('[data-mid]').attr('data-mid');
Chats.delete(messageId);
Chats.delete(messageId, ajaxify.data.roomId);
});
$('.recent-chats').on('scroll', function() {
@@ -126,7 +126,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
});
};
Chats.delete = function(messageId) {
Chats.delete = function(messageId, roomId) {
translator.translate('[[modules:chat.delete_message_confirm]]', function(translated) {
bootbox.confirm(translated, function(ok) {
if (!ok) {
@@ -134,7 +134,8 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
}
socket.emit('modules.chats.delete', {
messageId: messageId
messageId: messageId,
roomId: roomId
}, function(err) {
if (err) {
return app.alertError(err.message);
@@ -366,6 +367,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
});
} else {
socket.emit('modules.chats.edit', {
roomId: roomId,
mid: mid,
message: msg
}, function(err) {

2
public/src/modules/chat.js
View File

@@ -260,7 +260,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
})
.on('click', '[data-action="delete"]', function() {
var messageId = $(this).parents('[data-mid]').attr('data-mid');
Chats.delete(messageId);
Chats.delete(messageId, data.roomId);
});
Chats.addSinceHandler(chatModal.attr('roomId'), chatModal.find('.chat-content'), chatModal.find('[data-since]'));

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

@@ -174,9 +174,11 @@ SocketModules.chats.delete = function(socket, data, callback) {
}
Messaging.canEdit(data.messageId, socket.uid, function(err, allowed) {
if (allowed) {
Messaging.deleteMessage(data.messageId, data.roomId, callback);
if (err || !allowed) {
return callback(err || new Error('[[error:cant-delete-chat-message]]'));
}
Messaging.deleteMessage(data.messageId, data.roomId, callback);
});
};