tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #678 from matrix-org/dbkr/push_obey_enable

Browse source 
Don't ignore the obey overlay if the rule has an enabled attribute of False
This commit is contained in:
David Baker 2016-03-31 10:26:22 +01:00
commit c9500a9c1d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/push/push_rule_evaluator.py
View file

@ -133,8 +133,9 @@ class PushRuleEvaluator:
enabled = self.enabled_map.get(r['rule_id'], None)
if enabled is not None and not enabled:
continue
if not r.get("enabled", True):
elif enabled is None and not r.get("enabled", True):
# if no override, check enabled on the rule itself
# (may have come from a base rule)
continue
conditions = r['conditions']