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

feat: allow direct link to flag from post tools, #8531

Browse Source
This commit is contained in:
Julian Lam
2020-07-29 16:55:14 -04:00
parent 8415d2f014
commit c705e08a76
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,10 @@
"bookmark_instructions" : "Click here to return to the last read post in this thread.",
"flag_post": "Flag this post",
"flag_user": "Flag this user",
"flag-post": "Flag this post",
"flag-user": "Flag this user",
"already-flagged": "Already Flagged",
"view-flag-report": "View Flag Report",
"merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
"deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",

2
src/socket.io/posts/tools.js
View File

@@ -19,7 +19,7 @@ module.exports = function (SocketPosts) {
}
const results = await utils.promiseParallel({
posts: posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid', 'ip']),
posts: posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid', 'ip', 'flagId']),
isAdmin: user.isAdministrator(socket.uid),
isGlobalMod: user.isGlobalModerator(socket.uid),
isModerator: user.isModerator(socket.uid, data.cid),