diff --git a/src/common/helper.js b/src/common/helper.js index cb29890a..4d2f1dab 100644 --- a/src/common/helper.js +++ b/src/common/helper.js @@ -1038,7 +1038,7 @@ async function getProjects (currentUser, criteria = {}) { message: `response body: ${JSON.stringify(res.body)}` }) const result = _.map(res.body, (item) => { - return _.pick(item, ['id', 'name', 'invites', 'members']) + return _.extend(_.pick(item, ['id', 'invites', 'members']), { name: _.unescape(item.name) }) }) return { total: Number(_.get(res.headers, 'x-total')), @@ -1195,7 +1195,7 @@ async function getProjectById (currentUser, id) { context: 'getProjectById', message: `response body: ${JSON.stringify(res.body)}` }) - return _.pick(res.body, ['id', 'name', 'invites', 'members']) + return _.extend(_.pick(res.body, ['id', 'invites', 'members']), { name: _.unescape(res.body.name) }) } catch (err) { if (err.status === HttpStatus.FORBIDDEN) { throw new errors.ForbiddenError( @@ -1925,7 +1925,8 @@ async function createProject (currentUser, data) { context: 'createProject', message: `response body: ${JSON.stringify(res)}` }) - return _.get(res, 'body') + const result = _.get(res, 'body') + return _.extend(result, { name: _.unescape(_.get(result, 'name')) }) } /** diff --git a/src/eventHandlers/TeamEventHandler.js b/src/eventHandlers/TeamEventHandler.js index aeec9e25..985ffc61 100644 --- a/src/eventHandlers/TeamEventHandler.js +++ b/src/eventHandlers/TeamEventHandler.js @@ -49,7 +49,7 @@ async function sendNotificationEmail (payload) { logger.debug({ component: 'TeamEventHandler', context: 'sendNotificationEmail', - message: `project id: ${payload.project.id} created with jobs: ${_.join(_.map(payload.jobs, 'id'), ',')}` + message: `project id: ${payload.project.id}, subject: ${data.subject}, created with jobs: ${_.join(_.map(payload.jobs, 'id'), ',')}` }) }