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

closes #2970, closes #3078

Browse Source
This commit is contained in:
barisusakli
2015-04-21 16:26:24 -04:00
parent 2f2e2d60a0
commit 3ffd3a5d3c
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/src/client/topic/events.js
View File

@@ -1,7 +1,7 @@
'use strict';
/* globals config, app, ajaxify, define, socket, templates */
/* globals config, app, ajaxify, define, socket, templates, translator, utils */
define('forum/topic/events', [
'forum/topic/browsing',
@@ -20,8 +20,8 @@ define('forum/topic/events', [
'event:voted': updatePostVotesAndUserReputation,
'event:favourited': updateFavouriteCount,
'event:topic_deleted': toggleTopicDeleteState,
'event:topic_restored': toggleTopicDeleteState,
'event:topic_deleted': threadTools.setDeleteState,
'event:topic_restored': threadTools.setDeleteState,
'event:topic_purged': onTopicPurged,
'event:topic_locked': threadTools.setLockedState,
@@ -81,11 +81,6 @@ define('forum/topic/events', [
$('[data-pid="' + data.post.pid + '"] .favouriteCount').html(data.post.reputation).attr('data-favourites', data.post.reputation);
}
function toggleTopicDeleteState(data) {
threadTools.setLockedState(data);
threadTools.setDeleteState(data);
}
function onTopicPurged(data) {
ajaxify.go('category/' + ajaxify.variables.get('category_id'));
}

2
src/privileges/posts.js
View File

@@ -109,7 +109,7 @@ module.exports = function(privileges) {
return callback(null, true);
}
if (results.isEditable.isLocked) {
return callback(new Error('[[error:topic-locked]]]'));
return callback(new Error('[[error:topic-locked]]'));
}
if (results.isEditable.isEditExpired) {
return callback(new Error('[[error:post-edit-duration-expired, ' + meta.config.postEditDuration + ']]'));

3
src/threadTools.js
View File

@@ -36,7 +36,7 @@ var async = require('async'),
return callback(err);
}
topicData.deleted = isDelete ? 1 : 0;
ThreadTools[isDelete ? 'lock' : 'unlock'](tid, uid);
if (isDelete) {
plugins.fireHook('action:topic.delete', tid);
} else {
@@ -47,7 +47,6 @@ var async = require('async'),
tid: tid,
cid: topicData.cid,
isDelete: isDelete,
isLocked: isDelete,
uid: uid
};