Revert b4a41aa542 as it's just broken.

This commit is contained in:
David Baker 2016-01-22 17:21:15 +00:00
parent b4a41aa542
commit 60965bd7e5

View File

@ -135,16 +135,8 @@ class BulkPushRuleEvaluator:
evaluator, rule['conditions'], uid, display_name, condition_cache evaluator, rule['conditions'], uid, display_name, condition_cache
) )
if matches: if matches:
notify = False
actions = []
for a in rule['actions']:
if a != 'dont_notify':
actions.append(a)
elif a == 'notify':
notify = True
actions = [x for x in rule['actions'] if x != 'dont_notify'] actions = [x for x in rule['actions'] if x != 'dont_notify']
if actions and notify: if actions:
actions_by_user[uid] = actions actions_by_user[uid] = actions
break break
defer.returnValue(actions_by_user) defer.returnValue(actions_by_user)