zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-17 10:07:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add default to csv_export, readd content

Browse source
This commit is contained in:
zandercymatics 2024-01-19 09:13:04 -07:00
parent 5e1f99eae6
commit e6812afe8b
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/templates/domain_security_email.html
View file

@ -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 #}

2
src/registrar/utility/csv_export.py
View file

@ -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)"

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

@ -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