github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-24 14:08:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'andresmanelli-devel' into devel

Browse source
This commit is contained in:
Lauri Ojansivu 2017-10-03 15:09:57 +03:00
commit 08bab70dbe
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -1,10 +1,14 @@
# Upcoming Wekan release # 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). * [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 # v0.45 2017-10-01 Wekan release

1
models/activities.js
View file

@ -110,6 +110,7 @@ if (Meteor.isServer) {
if (activity.commentId) { if (activity.commentId) {
const comment = activity.comment(); const comment = activity.comment();
params.comment = comment.text; params.comment = comment.text;
params.commentId = comment._id;
} }
if (activity.attachmentId) { if (activity.attachmentId) {
const attachment = activity.attachment(); const attachment = activity.attachment();

6
models/cardComments.js
View file

@ -125,15 +125,15 @@ if (Meteor.isServer) {
boardId: paramBoardId, boardId: paramBoardId,
}); });
const cardComment = CardComments.findOne({_id: id, cardId:paramCardId, boardId: paramBoardId });
commentCreation(req.body.authorId, cardComment);
JsonRoutes.sendResult(res, { JsonRoutes.sendResult(res, {
code: 200, code: 200,
data: { data: {
_id: id, _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) { JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/comments/:commentId', function (req, res, next) {

5
server/notifications/outgoing.js
View file

@ -29,7 +29,10 @@ Meteor.methods({
text: `${text}`, 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]; if (params[key]) value[key] = params[key];
}); });
value.description = description; value.description = description;