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

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

View file

@ -179,4 +179,4 @@ h1, h2, h3 {
text-align: left;
background: var(--primary);
color: var(--header-link-color);
}
}

View file

@ -14,4 +14,4 @@
left: 1rem !important;
}
}
}
}

View file

@ -124,4 +124,4 @@ abbr[title] {
.flex-end {
align-items: flex-end;
}
}

View file

@ -106,4 +106,4 @@ a.usa-button--unstyled:visited {
position: relative;
top: -39.2px;
left: 88px;
}
}

View file

@ -7,4 +7,4 @@ fieldset {
fieldset:not(:first-child) {
margin-top: units(2);
}
}

View file

@ -18,4 +18,4 @@
margin-left: 0;
padding-left: 0;
border-left: none;
}
}

View file

@ -77,4 +77,4 @@
color: color('primary-dark');
font-weight: font-weight('semibold');
margin-bottom: units(0.5);
}
}

View file

@ -27,4 +27,4 @@
.stepnav {
margin-top: units(2);
}
}

View file

@ -90,4 +90,4 @@
border-top: none;
}
}
}
}

View file

@ -21,4 +21,4 @@ h2 {
line-height: line-height('heading', 3);
margin: units(4) 0 units(1);
color: color('primary-darker');
}
}

View file

@ -39,4 +39,4 @@
<use xlink:href="/assets/img/sprite.svg#close"></use>
</svg>
</button>
</div>
</div>

View file

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