Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-19 22:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

17
server/rulesHelper.js
View file

@ -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;
},
@ -65,10 +72,10 @@ RulesHelper = {
const emailSubject = action.emailSubject;
try {
Email.send({
to,
emailTo,
from: Accounts.emailTemplates.from,
subject,
text,
emailSubject,
emailMsg,
});
} catch (e) {
return;