diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-19 10:43:31 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-19 10:43:31 +0000 |
| commit | d028207a6e421b97eae886a501e3e427577bab29 (patch) | |
| tree | 4f452dfcb656771607eac291dfe34dd4ec49f812 /synapse/rest/client/v1/push_rule.py | |
| parent | Merge branch 'release-v0.8.0' of github.com:matrix-org/synapse (diff) | |
| parent | Update CHANGES (diff) | |
| download | synapse-d028207a6e421b97eae886a501e3e427577bab29.tar.xz | |
Merge branch 'release-v0.8.1' of github.com:matrix-org/synapse v0.8.1
Diffstat (limited to 'synapse/rest/client/v1/push_rule.py')
| -rw-r--r-- | synapse/rest/client/v1/push_rule.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py index fef0eb6572..d4e7ab2202 100644 --- a/synapse/rest/client/v1/push_rule.py +++ b/synapse/rest/client/v1/push_rule.py @@ -156,9 +156,12 @@ class PushRuleRestServlet(ClientV1RestServlet): template_rule = _rule_to_template(r) if template_rule: - template_rule['enabled'] = True if r['rule_id'] in enabled_map: template_rule['enabled'] = enabled_map[r['rule_id']] + elif 'enabled' in r: + template_rule['enabled'] = r['enabled'] + else: + template_rule['enabled'] = True rulearray.append(template_rule) path = request.postpath[1:] |