Merge pull request #1182 from jbe-dw/revertCorruptedHistoryFix

fix: Insert valid JSON in history.detail and replace single quotes in the database
This commit is contained in:
jbe-dw
2022-05-12 21:30:20 +02:00
committed by GitHub
3 changed files with 51 additions and 3 deletions

View File

@ -1,3 +1,4 @@
import json
import re
import traceback
from flask import current_app
@ -421,7 +422,7 @@ class Domain(db.Model):
if result['status'] == 'ok':
history = History(msg='Add reverse lookup domain {0}'.format(
domain_reverse_name),
detail=str({
detail=json.dumps({
'domain_type': 'Master',
'domain_master_ips': ''
}),

View File

@ -544,7 +544,7 @@ def setting(domain_name):
history = History(
msg='Change domain {0} access control'.format(
pretty_domain_name(domain_name)),
detail=str({'user_has_access': new_user_list}),
detail=json.dumps({'user_has_access': new_user_list}),
created_by=current_user.username,
domain_id=d.id)
history.add()
@ -582,7 +582,7 @@ def change_type(domain_name):
if status['status'] == 'ok':
history = History(msg='Update type for domain {0}'.format(
pretty_domain_name(domain_name)),
detail=str({
detail=json.dumps({
"domain": domain_name,
"type": domain_type,
"masters": domain_master_ips