1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00

Merge pull request #326 from dhpiggott/custom-dns-filter-secondary-nameserver

Do not show '_secondary_nameserver' in Custom DNS table
This commit is contained in:
Joshua Tauberer 2015-02-17 08:31:34 -05:00
commit 348d2b8701

View File

@ -258,6 +258,10 @@ def build_zone(domain, all_domains, additional_records, env, is_zone=True):
def get_custom_records(domain, additional_records, env): def get_custom_records(domain, additional_records, env):
for qname, value in additional_records.items(): for qname, value in additional_records.items():
# We don't count the secondary nameserver config (if present) as a record - that would just be
# confusing to users. Instead it is accessed/manipulated directly via (get/set)_custom_dns_config.
if qname == "_secondary_nameserver": continue
# Is this record for the domain or one of its subdomains? # Is this record for the domain or one of its subdomains?
# If `domain` is None, return records for all domains. # If `domain` is None, return records for all domains.
if domain is not None and qname != domain and not qname.endswith("." + domain): continue if domain is not None and qname != domain and not qname.endswith("." + domain): continue