Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed rules conflicts

Browse source
This commit is contained in:
Angelo Gallarello 2018-10-07 18:10:01 +02:00
parent 506b95107c
commit d0735e1d8e
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
server/rulesHelper.js
View file

@ -3,7 +3,9 @@ RulesHelper = {
const matchingRules = this.findMatchingRules(activity); const matchingRules = this.findMatchingRules(activity);
for(let i = 0; i< matchingRules.length; i++){ for(let i = 0; i< matchingRules.length; i++){
const action = matchingRules[i].getAction(); const action = matchingRules[i].getAction();
this.performAction(activity, action); if(action != undefined){
this.performAction(activity, action);
}
} }
}, },
findMatchingRules(activity){ findMatchingRules(activity){
@ -16,7 +18,12 @@ RulesHelper = {
const matchingTriggers = Triggers.find(matchingMap); const matchingTriggers = Triggers.find(matchingMap);
const matchingRules = []; const matchingRules = [];
matchingTriggers.forEach(function(trigger){ matchingTriggers.forEach(function(trigger){
matchingRules.push(trigger.getRule()); const rule = trigger.getRule();
// Check that for some unknown reason there are some leftover triggers
// not connected to any rules
if(rule != undefined){
matchingRules.push(trigger.getRule());
}
}); });
return matchingRules; return matchingRules;
}, },