mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-17 01:57:03 +02:00
Add default to csv_export, readd content
This commit is contained in:
parent
5e1f99eae6
commit
e6812afe8b
3 changed files with 5 additions and 3 deletions
|
@ -20,7 +20,7 @@
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
class="usa-button"
|
class="usa-button"
|
||||||
>{% if form.security_email.value is None or form.security_email.value == "dotgov@cisa.dhs.gov"%}Add security email{% else %}Save{% endif %}</button>
|
>{% if form.security_email.value is None or form.security_email.value == "dotgov@cisa.dhs.gov" or form.security_email.value == "registrar@dotgov.gov"%}Add security email{% else %}Save{% endif %}</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
{% endblock %} {# domain_content #}
|
{% endblock %} {# domain_content #}
|
||||||
|
|
|
@ -38,7 +38,7 @@ def write_row(writer, columns, domain_info):
|
||||||
if security_contacts:
|
if security_contacts:
|
||||||
security_email = security_contacts[0].email
|
security_email = security_contacts[0].email
|
||||||
|
|
||||||
invalid_emails = {"registrar@dotgov.gov"}
|
invalid_emails = {"registrar@dotgov.gov", "dotgov@cisa.dhs.gov"}
|
||||||
# These are default emails that should not be displayed in the csv report
|
# These are default emails that should not be displayed in the csv report
|
||||||
if security_email is not None and security_email.lower() in invalid_emails:
|
if security_email is not None and security_email.lower() in invalid_emails:
|
||||||
security_email = "(blank)"
|
security_email = "(blank)"
|
||||||
|
|
|
@ -568,7 +568,9 @@ class DomainSecurityEmailView(DomainFormBaseView):
|
||||||
"""The initial value for the form."""
|
"""The initial value for the form."""
|
||||||
initial = super().get_initial()
|
initial = super().get_initial()
|
||||||
security_contact = self.object.security_contact
|
security_contact = self.object.security_contact
|
||||||
if security_contact is None or security_contact.email == "dotgov@cisa.dhs.gov":
|
|
||||||
|
invalid_emails = ["dotgov@cisa.dhs.gov", "registrar@dotgov.gov"]
|
||||||
|
if security_contact is None or security_contact.email in invalid_emails:
|
||||||
initial["security_email"] = None
|
initial["security_email"] = None
|
||||||
return initial
|
return initial
|
||||||
initial["security_email"] = security_contact.email
|
initial["security_email"] = security_contact.email
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue