Merge pull request #165 from matrix-org/bugs/SYN-390

SYN-390: Don't modify the dictionary returned from the data store
erikj/theseus
Erik Johnston 2015-05-26 10:20:36 +01:00
commit 9ba3c1ede4
1 changed files with 7 additions and 4 deletions

View File

@ -118,11 +118,14 @@ class PushRuleRestServlet(ClientV1RestServlet):
user.to_string()
)
for r in rawrules:
r["conditions"] = json.loads(r["conditions"])
r["actions"] = json.loads(r["actions"])
ruleslist = []
for rawrule in rawrules:
rule = dict(rawrule)
rule["conditions"] = json.loads(rawrule["conditions"])
rule["actions"] = json.loads(rawrule["actions"])
ruleslist.append(rule)
ruleslist = baserules.list_with_base_rules(rawrules, user)
ruleslist = baserules.list_with_base_rules(ruleslist, user)
rules = {'global': {}, 'device': {}}