diff options
author | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-10-07 18:10:01 +0200 |
---|---|---|
committer | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-10-07 18:10:01 +0200 |
commit | d0735e1d8edb4f88ede9f103e692eac7d41484f9 (patch) | |
tree | 6c4921420086603ba9efe7a74156813c5b88124c | |
parent | 506b95107c9c124d07f36be295487b1454107a86 (diff) | |
download | wekan-d0735e1d8edb4f88ede9f103e692eac7d41484f9.tar.gz wekan-d0735e1d8edb4f88ede9f103e692eac7d41484f9.tar.bz2 wekan-d0735e1d8edb4f88ede9f103e692eac7d41484f9.zip |
Fixed rules conflicts
-rw-r--r-- | server/rulesHelper.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/server/rulesHelper.js b/server/rulesHelper.js index 4c195e23..3630507a 100644 --- a/server/rulesHelper.js +++ b/server/rulesHelper.js @@ -3,7 +3,9 @@ RulesHelper = { const matchingRules = this.findMatchingRules(activity); for(let i = 0; i< matchingRules.length; i++){ const action = matchingRules[i].getAction(); - this.performAction(activity, action); + if(action != undefined){ + this.performAction(activity, action); + } } }, findMatchingRules(activity){ @@ -16,7 +18,12 @@ RulesHelper = { const matchingTriggers = Triggers.find(matchingMap); const matchingRules = []; 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; }, |