diff options
author | Akuket <32392661+Akuket@users.noreply.github.com> | 2018-10-09 14:49:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-09 14:49:12 +0200 |
commit | 28a01862d04654784bd6010035c3a6fe1690ba60 (patch) | |
tree | ee52d3c84b12f5ada9a3faf12925dd5806385a91 /models | |
parent | 3b4f285fea4a90ee96bfce855e1539adcec9b7aa (diff) | |
parent | 58855ada97677d25475ba4721834c0f576ed3b47 (diff) | |
download | wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.gz wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.bz2 wekan-28a01862d04654784bd6010035c3a6fe1690ba60.zip |
Merge branch 'edge' into edge
Diffstat (limited to 'models')
-rw-r--r-- | models/checklistItems.js | 16 | ||||
-rw-r--r-- | models/wekanCreator.js | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/models/checklistItems.js b/models/checklistItems.js index 7132bc7c..c85c0260 100644 --- a/models/checklistItems.js +++ b/models/checklistItems.js @@ -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); }); diff --git a/models/wekanCreator.js b/models/wekanCreator.js index b018b06d..59d0cfd5 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -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]; |