mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-23 03:06:01 +02:00
Add '.value'
This commit is contained in:
parent
382fbdb98b
commit
bcd44f42bf
4 changed files with 8 additions and 8 deletions
|
@ -1406,7 +1406,7 @@ class Domain(TimeStampedModel, DomainHelper):
|
||||||
DF = epp.DiscloseField
|
DF = epp.DiscloseField
|
||||||
fields = {DF.EMAIL}
|
fields = {DF.EMAIL}
|
||||||
|
|
||||||
hidden_security_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT, DefaultEmail.LEGACY_DEFAULT]
|
hidden_security_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, DefaultEmail.LEGACY_DEFAULT.value]
|
||||||
disclose = is_security and contact.email not in hidden_security_emails
|
disclose = is_security and contact.email not in hidden_security_emails
|
||||||
# Delete after testing on other devices
|
# Delete after testing on other devices
|
||||||
logger.info("Updated domain contact %s to disclose: %s", contact.email, disclose)
|
logger.info("Updated domain contact %s to disclose: %s", contact.email, disclose)
|
||||||
|
|
|
@ -89,7 +89,7 @@ class PublicContact(TimeStampedModel):
|
||||||
sp="VA",
|
sp="VA",
|
||||||
pc="20598-0645",
|
pc="20598-0645",
|
||||||
cc="US",
|
cc="US",
|
||||||
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT,
|
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value,
|
||||||
voice="+1.8882820870",
|
voice="+1.8882820870",
|
||||||
pw="thisisnotapassword",
|
pw="thisisnotapassword",
|
||||||
)
|
)
|
||||||
|
@ -106,7 +106,7 @@ class PublicContact(TimeStampedModel):
|
||||||
sp="VA",
|
sp="VA",
|
||||||
pc="22201",
|
pc="22201",
|
||||||
cc="US",
|
cc="US",
|
||||||
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT,
|
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value,
|
||||||
voice="+1.8882820870",
|
voice="+1.8882820870",
|
||||||
pw="thisisnotapassword",
|
pw="thisisnotapassword",
|
||||||
)
|
)
|
||||||
|
@ -123,7 +123,7 @@ class PublicContact(TimeStampedModel):
|
||||||
sp="VA",
|
sp="VA",
|
||||||
pc="22201",
|
pc="22201",
|
||||||
cc="US",
|
cc="US",
|
||||||
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT,
|
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value,
|
||||||
voice="+1.8882820870",
|
voice="+1.8882820870",
|
||||||
pw="thisisnotapassword",
|
pw="thisisnotapassword",
|
||||||
)
|
)
|
||||||
|
@ -140,7 +140,7 @@ class PublicContact(TimeStampedModel):
|
||||||
sp="VA",
|
sp="VA",
|
||||||
pc="22201",
|
pc="22201",
|
||||||
cc="US",
|
cc="US",
|
||||||
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT,
|
email=DefaultEmail.PUBLIC_CONTACT_DEFAULT.value,
|
||||||
voice="+1.8882820870",
|
voice="+1.8882820870",
|
||||||
pw="thisisnotapassword",
|
pw="thisisnotapassword",
|
||||||
)
|
)
|
||||||
|
|
|
@ -65,7 +65,7 @@ def parse_row(columns, domain_info: DomainInformation, security_emails_dict=None
|
||||||
security_email = _email if _email is not None else " "
|
security_email = _email if _email is not None else " "
|
||||||
|
|
||||||
# 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
|
||||||
invalid_emails = {DefaultEmail.LEGACY_DEFAULT, DefaultEmail.PUBLIC_CONTACT_DEFAULT}
|
invalid_emails = {DefaultEmail.LEGACY_DEFAULT.value, DefaultEmail.PUBLIC_CONTACT_DEFAULT.value}
|
||||||
if security_email.lower() in invalid_emails:
|
if security_email.lower() in invalid_emails:
|
||||||
security_email = "(blank)"
|
security_email = "(blank)"
|
||||||
|
|
||||||
|
|
|
@ -142,7 +142,7 @@ class DomainView(DomainBaseView):
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
context = super().get_context_data(**kwargs)
|
context = super().get_context_data(**kwargs)
|
||||||
|
|
||||||
default_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT, DefaultEmail.LEGACY_DEFAULT]
|
default_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, DefaultEmail.LEGACY_DEFAULT.value]
|
||||||
|
|
||||||
context["hidden_security_emails"] = default_emails
|
context["hidden_security_emails"] = default_emails
|
||||||
|
|
||||||
|
@ -571,7 +571,7 @@ class DomainSecurityEmailView(DomainFormBaseView):
|
||||||
initial = super().get_initial()
|
initial = super().get_initial()
|
||||||
security_contact = self.object.security_contact
|
security_contact = self.object.security_contact
|
||||||
|
|
||||||
invalid_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT, DefaultEmail.LEGACY_DEFAULT]
|
invalid_emails = [DefaultEmail.PUBLIC_CONTACT_DEFAULT.value, DefaultEmail.LEGACY_DEFAULT.value]
|
||||||
if security_contact is None or security_contact.email in invalid_emails:
|
if security_contact is None or security_contact.email in invalid_emails:
|
||||||
initial["security_email"] = None
|
initial["security_email"] = None
|
||||||
return initial
|
return initial
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue