mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-01 13:20:41 +01:00
fix: #7338
This commit is contained in:
@@ -212,6 +212,16 @@ define('forum/topic/threadTools', [
|
||||
components.get('topic/purge').toggleClass('hidden', !data.isDelete).parent().attr('hidden', !data.isDelete ? '' : null);
|
||||
components.get('topic/deleted/message').toggleClass('hidden', !data.isDelete);
|
||||
|
||||
if (data.isDelete) {
|
||||
app.parseAndTranslate('partials/topic/deleted-message', {
|
||||
deleter: data.user,
|
||||
deleted: true,
|
||||
deletedTimestampISO: utils.toISOString(Date.now()),
|
||||
}, function (html) {
|
||||
components.get('topic/deleted/message').replaceWith(html);
|
||||
html.find('.timeago').timeago();
|
||||
});
|
||||
}
|
||||
var hideReply = data.isDelete && !ajaxify.data.privileges.isAdminOrMod;
|
||||
|
||||
components.get('topic/reply/container').toggleClass('hidden', hideReply);
|
||||
|
||||
@@ -5,6 +5,7 @@ var _ = require('lodash');
|
||||
|
||||
var db = require('../database');
|
||||
var categories = require('../categories');
|
||||
var user = require('../user');
|
||||
var plugins = require('../plugins');
|
||||
var privileges = require('../privileges');
|
||||
|
||||
@@ -61,15 +62,16 @@ module.exports = function (Topics) {
|
||||
} else {
|
||||
plugins.fireHook('action:topic.restore', { topic: topicData, uid: uid });
|
||||
}
|
||||
|
||||
var data = {
|
||||
user.getUserFields(uid, ['username', 'userslug'], next);
|
||||
},
|
||||
function (userData, next) {
|
||||
next(null, {
|
||||
tid: tid,
|
||||
cid: topicData.cid,
|
||||
isDelete: isDelete,
|
||||
uid: uid,
|
||||
};
|
||||
|
||||
next(null, data);
|
||||
user: userData,
|
||||
});
|
||||
},
|
||||
], callback);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user