diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-10-03 14:03:15 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-10-03 14:03:15 +0300 |
| commit | d6ef4a8266e43f355f6058ceb8e1d8291dc536dd (patch) | |
| tree | 591a30a3634c796f1deea9bd9f387abc667a68d6 /models | |
| parent | 1d3e2ffadd43c77281de2e325df50c1e3026a4c5 (diff) | |
| parent | de1ca1d12ac8f347b82ce732f45c7e07ccf09d86 (diff) | |
| download | wekan-d6ef4a8266e43f355f6058ceb8e1d8291dc536dd.tar.gz wekan-d6ef4a8266e43f355f6058ceb8e1d8291dc536dd.tar.bz2 wekan-d6ef4a8266e43f355f6058ceb8e1d8291dc536dd.zip | |
Merge branch 'devel' of https://github.com/andresmanelli/wekan into andresmanelli-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) { |