diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-10-03 15:09:57 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-10-03 15:09:57 +0300 |
commit | 08bab70dbe0dfd16bda906f688bba0aa6084b1c5 (patch) | |
tree | 1c79caf72e097a6af06d9a3e42e95e4828d06f68 | |
parent | 1d3e2ffadd43c77281de2e325df50c1e3026a4c5 (diff) | |
parent | ed4c749cea32d67ff68a9d9cc8bc0c81104f5f03 (diff) | |
download | wekan-08bab70dbe0dfd16bda906f688bba0aa6084b1c5.tar.gz wekan-08bab70dbe0dfd16bda906f688bba0aa6084b1c5.tar.bz2 wekan-08bab70dbe0dfd16bda906f688bba0aa6084b1c5.zip |
Merge branch 'andresmanelli-devel' into devel
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | models/activities.js | 1 | ||||
-rw-r--r-- | models/cardComments.js | 6 | ||||
-rw-r--r-- | server/notifications/outgoing.js | 5 |
4 files changed, 14 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 72cbbff1..96ecd00f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,14 @@ # Upcoming Wekan release -This release fixes the following bugs: +This release adds the following new features: + +* [Webhook parameters and response order](https://github.com/wekan/wekan/pull/1263). + +and fixes the following bugs: * [Fix: Slider for Comments only does not work correctly with over 21 activities](https://github.com/wekan/wekan/pull/1247). -Thanks to Github user nztqa for contributions. +Thanks to Github users andresmanelli and nztqa for their contributions. # v0.45 2017-10-01 Wekan release diff --git a/models/activities.js b/models/activities.js index 4ddcfa72..be290dce 100644 --- a/models/activities.js +++ b/models/activities.js @@ -110,6 +110,7 @@ if (Meteor.isServer) { if (activity.commentId) { const comment = activity.comment(); params.comment = comment.text; + params.commentId = comment._id; } if (activity.attachmentId) { const attachment = activity.attachment(); diff --git a/models/cardComments.js b/models/cardComments.js index 352030f1..cc1c55bc 100644 --- a/models/cardComments.js +++ b/models/cardComments.js @@ -125,15 +125,15 @@ if (Meteor.isServer) { boardId: paramBoardId, }); - const cardComment = CardComments.findOne({_id: id, cardId:paramCardId, boardId: paramBoardId }); - commentCreation(req.body.authorId, cardComment); - JsonRoutes.sendResult(res, { code: 200, data: { _id: id, }, }); + + const cardComment = CardComments.findOne({_id: id, cardId:paramCardId, boardId: paramBoardId }); + commentCreation(req.body.authorId, cardComment); }); JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/comments/:commentId', function (req, res, next) { diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js index 07a0a903..ed3d8df7 100644 --- a/server/notifications/outgoing.js +++ b/server/notifications/outgoing.js @@ -29,7 +29,10 @@ Meteor.methods({ text: `${text}`, }; - ['cardId', 'listId', 'oldListId', 'boardId'].forEach((key) => { + [ 'cardId', 'listId', 'oldListId', + 'boardId', 'comment', 'user', + 'card', 'commentId', + ].forEach((key) => { if (params[key]) value[key] = params[key]; }); value.description = description; |