summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-08-22 22:02:04 +0300
committerLauri Ojansivu <x@xet7.org>2018-08-22 22:02:04 +0300
commita91f0b5c3bffb0b3e10a4c7914dc9d181aafa7bc (patch)
tree35707e28a1b70eeec10f68188f5048c821b2044b
parentcc84bf2de38f15d20a5f46ac9f57e4a967375f88 (diff)
parentfcbbb93bb663eec04e53230e447b2846f28d86e6 (diff)
downloadwekan-a91f0b5c3bffb0b3e10a4c7914dc9d181aafa7bc.tar.gz
wekan-a91f0b5c3bffb0b3e10a4c7914dc9d181aafa7bc.tar.bz2
wekan-a91f0b5c3bffb0b3e10a4c7914dc9d181aafa7bc.zip
Merge branch 'devel' of https://github.com/omarsy/wekan into omarsy-devel
-rw-r--r--server/notifications/outgoing.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index 779d41a0..b35b3b2e 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -8,6 +8,8 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
});
});
+const webhooksAtbts = ( (process.env.WEBHOOKS_ATTRIBUTES && process.env.WEBHOOKS_ATTRIBUTES.split(',') ) || ['cardId', 'listId', 'oldListId', 'boardId', 'comment', 'user', 'card', 'commentId']);
+
Meteor.methods({
outgoingWebhooks(integrations, description, params) {
check(integrations, Array);
@@ -19,7 +21,7 @@ Meteor.methods({
if (quoteParams[key]) quoteParams[key] = `"${params[key]}"`;
});
- const userId = (params.userId)?params.userId:integrations[0].userId;
+ const userId = (params.userId) ? params.userId : integrations[0].userId;
const user = Users.findOne(userId);
const text = `${params.user} ${TAPi18n.__(description, quoteParams, user.getLanguage())}\n${params.url}`;
@@ -29,10 +31,7 @@ Meteor.methods({
text: `${text}`,
};
- [ 'cardId', 'listId', 'oldListId',
- 'boardId', 'comment', 'user',
- 'card', 'commentId',
- ].forEach((key) => {
+ webhooksAtbts.forEach((key) => {
if (params[key]) value[key] = params[key];
});
value.description = description;