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

Merge branch 'GhassenRjab-hotfix/issue-1198' into devel

Browse source 
Fix errors caused by checklist items activities.
Thanks to GhassenRjab and nztqa ! Closes #1198
This commit is contained in:
Lauri Ojansivu 2017-09-01 22:06:17 +03:00
commit 491a352792
2 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGELOG.md
View file

@ -1,8 +1,17 @@
# Upcoming Wekan release
This release fixes the following bugs:
* [Fix errors caused by checklist items activities](https://github.com/wekan/wekan/pull/1200).
Thanks to GitHub users GhassenRjab and nztqa for contributions.
# v0.34 2017-08-30 Wekan release
This release adds the following new features:
* [Import Trello and Wekan board times of creation of activities](https://github.com/wekan/wekan/pull/1187).
* [Import Trello and Wekan board times of creation of activities](https://github.com/wekan/wekan/pull/1187);
* Newest Wekan is available at Sandstorm App Market.
Known issues:

33
models/checklists.js
View file

@ -164,21 +164,32 @@ if (Meteor.isServer) {
// The future is now
Checklists.after.update((userId, doc, fieldNames, modifier) => {
if (fieldNames.includes('items')) {
Activities.insert({
userId,
activityType: 'addChecklistItem',
cardId: doc.cardId,
boardId: Cards.findOne(doc.cardId).boardId,
checklistId: doc._id,
checklistItemId: modifier.$addToSet.items._id,
});
if (modifier.$addToSet) {
Activities.insert({
userId,
activityType: 'addChecklistItem',
cardId: doc.cardId,
boardId: Cards.findOne(doc.cardId).boardId,
checklistId: doc._id,
checklistItemId: modifier.$addToSet.items._id,
});
} else if (modifier.$pull) {
const activity = Activities.findOne({
checklistItemId: modifier.$pull.items._id,
});
if (activity) {
Activities.remove(activity._id);
}
}
}
});
Checklists.before.remove((userId, doc) => {
const activity = Activities.findOne({ checklistId: doc._id });
if (activity) {
Activities.remove(activity._id);
const activities = Activities.find({ checklistId: doc._id });
if (activities) {
activities.forEach((activity) => {
Activities.remove(activity._id);
});
}
});
}