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 /models | |
| parent | 1d3e2ffadd43c77281de2e325df50c1e3026a4c5 (diff) | |
| parent | ed4c749cea32d67ff68a9d9cc8bc0c81104f5f03 (diff) | |
| download | wekan-08bab70dbe0dfd16bda906f688bba0aa6084b1c5.tar.gz wekan-08bab70dbe0dfd16bda906f688bba0aa6084b1c5.tar.bz2 wekan-08bab70dbe0dfd16bda906f688bba0aa6084b1c5.zip | |
Merge branch 'andresmanelli-devel' into devel
Diffstat (limited to 'models')
| -rw-r--r-- | models/activities.js | 1 | ||||
| -rw-r--r-- | models/cardComments.js | 6 |
2 files changed, 4 insertions, 3 deletions
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) { |