cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-08 22:50:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete blank comments. Fix for ngoduykhanh/PowerDNS-Admin#919 (#920)

Browse Source
This commit is contained in:
jyoung15 2021-05-07 17:43:44 -04:00 committed by GitHub
parent f3a98eb692
commit 32983635c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
powerdnsadmin/models/record.py
View File

@ -311,13 +311,26 @@ class Record(object):
new_rrsets, del_rrsets = self.compare(domain_name, submitted_records) new_rrsets, del_rrsets = self.compare(domain_name, submitted_records)
# Remove blank comments from rrsets for compatibility with some backends # Remove blank comments from rrsets for compatibility with some backends
def remove_blank_comments(rrset):
if not rrset['comments']:
del rrset['comments']
elif isinstance(rrset['comments'], list):
# Merge all non-blank comment values into a list
merged_comments = [
v
for c in rrset['comments']
for v in c.values()
if v
]
# Delete comment if all values are blank (len(merged_comments) == 0)
if not merged_comments:
del rrset['comments']
for r in new_rrsets['rrsets']: for r in new_rrsets['rrsets']:
if not r['comments']: remove_blank_comments(r)
del r['comments']
for r in del_rrsets['rrsets']: for r in del_rrsets['rrsets']:
if not r['comments']: remove_blank_comments(r)
del r['comments']
# Submit the changes to PDNS API # Submit the changes to PDNS API
try: try: