deblan/PowerDNS-Admin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #427. JSON parse error on history detail

Browse source
This commit is contained in:
Khanh Ngo 2018-12-20 15:26:14 +07:00
parent c1f5d76c6c
commit 082969de72
No known key found for this signature in database
GPG key ID: B9AE3BAF6D5A7B22
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views.py
View file

@ -829,7 +829,8 @@ def record_apply(domain_name):
r = Record()
result = r.apply(domain_name, submitted_record)
if result['status'] == 'ok':
history = History(msg='Apply record changes to domain {0}'.format(domain_name), detail=str(jdata), created_by=current_user.username)
jdata.pop('_csrf_token', None) # don't store csrf token in the history.
history = History(msg='Apply record changes to domain {0}'.format(domain_name), detail=str(json.dumps(jdata)), created_by=current_user.username)
history.add()
return make_response(jsonify( result ), 200)
else:
@ -1095,7 +1096,8 @@ def apply_records(template):
t = DomainTemplate.query.filter(DomainTemplate.name == template).first()
result = t.replace_records(records)
if result['status'] == 'ok':
history = History(msg='Apply domain template record changes to domain template {0}'.format(template), detail=str(jdata), created_by=current_user.username)
jdata.pop('_csrf_token', None) # don't store csrf token in the history.
history = History(msg='Apply domain template record changes to domain template {0}'.format(template), detail=str(json.dumps(jdata)), created_by=current_user.username)
history.add()
return make_response(jsonify(result), 200)
else: