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

fix: #7624, default open state on stateless flags

Browse Source
This commit is contained in:
Julian Lam
2019-05-21 12:23:19 -04:00
parent c6449c106b
commit 91f0bce628
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/flags.js
View File

@@ -93,7 +93,9 @@ Flags.get = function (flagId, callback) {
targetObj: async.apply(Flags.getTarget, data.base.type, data.base.targetId, 0), targetObj: async.apply(Flags.getTarget, data.base.type, data.base.targetId, 0),
}, function (err, payload) { }, function (err, payload) {
// Final object return construction // Final object return construction
next(err, Object.assign(data.base, { next(err, Object.assign({
state: 'open',
}, data.base, {
description: validator.escape(data.base.description), description: validator.escape(data.base.description),
datetimeISO: utils.toISOString(data.base.datetime), datetimeISO: utils.toISOString(data.base.datetime),
target_readable: data.base.type.charAt(0).toUpperCase() + data.base.type.slice(1) + ' ' + data.base.targetId, target_readable: data.base.type.charAt(0).toUpperCase() + data.base.type.slice(1) + ' ' + data.base.targetId,
@@ -179,7 +181,9 @@ Flags.list = function (filters, uid, callback) {
async.apply(db.getObject, 'flag:' + flagId), async.apply(db.getObject, 'flag:' + flagId),
function (flagObj, next) { function (flagObj, next) {
user.getUserFields(flagObj.uid, ['username', 'picture'], function (err, userObj) { user.getUserFields(flagObj.uid, ['username', 'picture'], function (err, userObj) {
next(err, Object.assign(flagObj, { next(err, Object.assign({
state: 'open',
}, flagObj, {
reporter: { reporter: {
username: userObj.username, username: userObj.username,
picture: userObj.picture, picture: userObj.picture,