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

feat: #8171, add oldCategory if topic is moved

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-11-17 13:56:04 -05:00
parent b44ddecdf8
commit 35f932cd64
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/topic.json
View File

@@ -33,6 +33,7 @@
"locked": "Locked", "locked": "Locked",
"pinned": "Pinned", "pinned": "Pinned",
"moved": "Moved", "moved": "Moved",
"moved-from": "Moved from %1",
"copy-ip": "Copy IP", "copy-ip": "Copy IP",
"ban-ip": "Ban IP", "ban-ip": "Ban IP",
"view-history": "Edit History", "view-history": "Edit History",

10
src/controllers/topics.js
View File

@@ -5,6 +5,7 @@ const nconf = require('nconf');
const user = require('../user'); const user = require('../user');
const meta = require('../meta'); const meta = require('../meta');
const topics = require('../topics'); const topics = require('../topics');
const categories = require('../categories');
const posts = require('../posts'); const posts = require('../posts');
const privileges = require('../privileges'); const privileges = require('../privileges');
const helpers = require('./helpers'); const helpers = require('./helpers');
@@ -93,6 +94,7 @@ topicsController.get = async function getTopic(req, res, callback) {
await Promise.all([ await Promise.all([
buildBreadcrumbs(topicData), buildBreadcrumbs(topicData),
addOldCategory(topicData, userPrivileges),
addTags(topicData, req, res), addTags(topicData, req, res),
incrementViewCount(req, tid), incrementViewCount(req, tid),
markAsRead(req, tid), markAsRead(req, tid),
@@ -166,6 +168,14 @@ async function buildBreadcrumbs(topicData) {
topicData.breadcrumbs = parentCrumbs.concat(breadcrumbs); topicData.breadcrumbs = parentCrumbs.concat(breadcrumbs);
} }
async function addOldCategory(topicData, userPrivileges) {
if (userPrivileges.isAdminOrMod && topicData.oldCid) {
topicData.oldCategory = await categories.getCategoryFields(
topicData.oldCid, ['cid', 'name', 'icon', 'bgColor', 'color', 'slug']
);
}
}
async function addTags(topicData, req, res) { async function addTags(topicData, req, res) {
const postIndex = parseInt(req.params.post_index, 10) || 0; const postIndex = parseInt(req.params.post_index, 10) || 0;
const postAtIndex = topicData.posts.find(p => parseInt(p.index, 10) === parseInt(Math.max(0, postIndex - 1), 10)); const postAtIndex = topicData.posts.find(p => parseInt(p.index, 10) === parseInt(Math.max(0, postIndex - 1), 10));