mirror of
https://github.com/wekan/wekan.git
synced 2025-12-16 23:40:13 +01:00
Models: Fix remove member activity
The member is only set to inactive, so we could not test for $pull. Instead we have to look into the $set modified and check whether the member was deactivated.
This commit is contained in:
parent
301210c87b
commit
ce4fcbfae4
1 changed files with 23 additions and 11 deletions
|
|
@ -449,17 +449,28 @@ if (Meteor.isServer) {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const foreachRemovedMember = (doc, modifier, callback) => {
|
||||||
|
Object.keys(modifier).forEach((set) => {
|
||||||
|
if (modifier[set] !== false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const parts = set.split('.');
|
||||||
|
if (parts.length === 3 && parts[0] === 'members' && parts[2] === 'isActive') {
|
||||||
|
callback(doc.members[parts[1]].userId);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
// Add a new activity if we add or remove a member to the board
|
// Add a new activity if we add or remove a member to the board
|
||||||
Boards.after.update((userId, doc, fieldNames, modifier) => {
|
Boards.after.update((userId, doc, fieldNames, modifier) => {
|
||||||
if (!_.contains(fieldNames, 'members')) {
|
if (!_.contains(fieldNames, 'members')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let memberId;
|
|
||||||
|
|
||||||
// Say hello to the new member
|
// Say hello to the new member
|
||||||
if (modifier.$push && modifier.$push.members) {
|
if (modifier.$push && modifier.$push.members) {
|
||||||
memberId = modifier.$push.members.userId;
|
const memberId = modifier.$push.members.userId;
|
||||||
Activities.insert({
|
Activities.insert({
|
||||||
userId,
|
userId,
|
||||||
memberId,
|
memberId,
|
||||||
|
|
@ -470,14 +481,15 @@ if (Meteor.isServer) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Say goodbye to the former member
|
// Say goodbye to the former member
|
||||||
if (modifier.$pull && modifier.$pull.members) {
|
if (modifier.$set) {
|
||||||
memberId = modifier.$pull.members.userId;
|
foreachRemovedMember(doc, modifier.$set, (memberId) => {
|
||||||
Activities.insert({
|
Activities.insert({
|
||||||
userId,
|
userId,
|
||||||
memberId,
|
memberId,
|
||||||
type: 'member',
|
type: 'member',
|
||||||
activityType: 'removeBoardMember',
|
activityType: 'removeBoardMember',
|
||||||
boardId: doc._id,
|
boardId: doc._id,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue