Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-03-03 20:30:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'edge' into edge

Browse source
This commit is contained in:
Akuket 2018-10-09 14:49:12 +02:00 • committed by GitHub
commit 28a01862d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 344 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

16
models/checklistItems.js
View file

@ -118,7 +118,7 @@ function publishCheckActivity(userId, doc){
Activities.insert(act);
}
function publishChekListCompleted(userId, doc, fieldNames, modifier){
function publishChekListCompleted(userId, doc){
const card = Cards.findOne(doc.cardId);
const boardId = card.boardId;
const checklistId = doc.checklistId;
@ -130,13 +130,13 @@ function publishChekListCompleted(userId, doc, fieldNames, modifier){
cardId: doc.cardId,
boardId,
checklistId: doc.checklistId,
checklistName:checkList.title,
checklistName: checkList.title,
};
Activities.insert(act);
}
}
function publishChekListUncompleted(userId, doc, fieldNames, modifier){
function publishChekListUncompleted(userId, doc){
const card = Cards.findOne(doc.cardId);
const boardId = card.boardId;
const checklistId = doc.checklistId;
@ -148,7 +148,7 @@ function publishChekListUncompleted(userId, doc, fieldNames, modifier){
cardId: doc.cardId,
boardId,
checklistId: doc.checklistId,
checklistName:checkList.title,
checklistName: checkList.title,
};
Activities.insert(act);
}
@ -160,13 +160,13 @@ if (Meteor.isServer) {
ChecklistItems._collection._ensureIndex({ checklistId: 1 });
});
ChecklistItems.after.update((userId, doc, fieldNames, modifier) => {
ChecklistItems.after.update((userId, doc, fieldNames) => {
publishCheckActivity(userId, doc);
publishChekListCompleted(userId, doc, fieldNames, modifier);
publishChekListCompleted(userId, doc, fieldNames);
});
ChecklistItems.before.update((userId, doc, fieldNames, modifier) => {
publishChekListUncompleted(userId, doc, fieldNames, modifier);
ChecklistItems.before.update((userId, doc, fieldNames) => {
publishChekListUncompleted(userId, doc, fieldNames);
});

6
models/wekanCreator.js
View file

@ -510,7 +510,7 @@ export class WekanCreator {
}
createTriggers(wekanTriggers, boardId) {
wekanTriggers.forEach((trigger, ruleIndex) => {
wekanTriggers.forEach((trigger) => {
if (trigger.hasOwnProperty('labelId')) {
trigger.labelId = this.labels[trigger.labelId];
}
@ -525,7 +525,7 @@ export class WekanCreator {
}
createActions(wekanActions, boardId) {
wekanActions.forEach((action, ruleIndex) => {
wekanActions.forEach((action) => {
if (action.hasOwnProperty('labelId')) {
action.labelId = this.labels[action.labelId];
}
@ -540,7 +540,7 @@ export class WekanCreator {
}
createRules(wekanRules, boardId) {
wekanRules.forEach((rule, ruleIndex) => {
wekanRules.forEach((rule) => {
// Create the rule
rule.boardId = boardId;
rule.triggerId = this.triggers[rule.triggerId];