zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-27 21:16:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dk/1091-dnssec' into dk/1122-dnssec-rewrite

Browse source
This commit is contained in:
David Kennedy 2023-10-11 12:27:52 -04:00
commit fb29271af8
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
12 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/registrar/views/domain.py
View file

@ -241,7 +241,7 @@ class DomainDNSSECView(DomainPermissionView, FormMixin):
has_dnssec_records = self.domain.dnssecdata is not None has_dnssec_records = self.domain.dnssecdata is not None
# Create HTML for the buttons # Create HTML for the modal button
modal_button = ( modal_button = (
'<button type="submit" ' '<button type="submit" '
'class="usa-button" ' 'class="usa-button" '
@ -297,6 +297,8 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
if dnssecdata is not None: if dnssecdata is not None:
if dnssecdata.keyData is not None: if dnssecdata.keyData is not None:
# TODO: Throw an error # TODO: Throw an error
# Note: This is moot if we're
# removing key data
pass pass
if dnssecdata.dsData is not None: if dnssecdata.dsData is not None:
@ -311,7 +313,7 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
for record in dnssecdata.dsData for record in dnssecdata.dsData
) )
# Ensure at least 3 fields, filled or empty # Ensure at least 1 record, filled or empty
while len(initial_data) == 0: while len(initial_data) == 0:
initial_data.append({}) initial_data.append({})
@ -385,7 +387,6 @@ class DomainDsdataView(DomainPermissionView, FormMixin):
try: try:
domain.dnssecdata = dnssecdata domain.dnssecdata = dnssecdata
except RegistryError as err: except RegistryError as err:
# Alysia: Check client hold error handling and duplicate this here
errmsg = "Error updating DNSSEC data in the registry." errmsg = "Error updating DNSSEC data in the registry."
logger.error(errmsg) logger.error(errmsg)
logger.error(err) logger.error(err)
@ -415,7 +416,9 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
if dnssecdata is not None: if dnssecdata is not None:
if dnssecdata.dsData is not None: if dnssecdata.dsData is not None:
# TODO: Throw an error # TODO: Throw an error?
# Note: this is moot if we're
# removing Key data
pass pass
if dnssecdata.keyData is not None: if dnssecdata.keyData is not None:
@ -430,7 +433,7 @@ class DomainKeydataView(DomainPermissionView, FormMixin):
for record in dnssecdata.keyData for record in dnssecdata.keyData
) )
# Ensure at least 3 fields, filled or empty # Ensure at least 1 record, filled or empty
while len(initial_data) == 0: while len(initial_data) == 0:
initial_data.append({}) initial_data.append({})