zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-06 01:35:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

design review changes

Browse source
This commit is contained in:
matthewswspence 2024-10-07 12:16:21 -05:00
parent 50ca20fe57
commit 7646c91691
No known key found for this signature in database
GPG key ID: FB458202A7852BA4
2 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/registrar/tests/test_views_domain.py
View file

@ -2035,7 +2035,7 @@ class TestDomainChangeNotifications(TestDomainOverview):
self.assertIn("DOMAIN: igorville.gov", body)
self.assertIn("UPDATED BY: First Last info@example.com", body)
self.assertIn("INFORMATION UPDATED: Org Name/Address", body)
self.assertIn("INFORMATION UPDATED: Organization details", body)
@boto3_mocking.patching
@less_console_noise_decorator
@ -2085,7 +2085,7 @@ class TestDomainChangeNotifications(TestDomainOverview):
self.assertIn("DOMAIN: igorville.gov", body)
self.assertIn("UPDATED BY: First Last info@example.com", body)
self.assertIn("INFORMATION UPDATED: Security Email", body)
self.assertIn("INFORMATION UPDATED: Security email", body)
@boto3_mocking.patching
@less_console_noise_decorator
@ -2147,7 +2147,7 @@ class TestDomainChangeNotifications(TestDomainOverview):
self.assertIn("DOMAIN: igorville.gov", body)
self.assertIn("UPDATED BY: First Last info@example.com", body)
self.assertIn("INFORMATION UPDATED: DS Data", body)
self.assertIn("INFORMATION UPDATED: DNSSEC / DS Data", body)
@boto3_mocking.patching
@less_console_noise_decorator
@ -2178,7 +2178,7 @@ class TestDomainChangeNotifications(TestDomainOverview):
self.assertIn("DOMAIN: igorville.gov", body)
self.assertIn("UPDATED BY: First Last info@example.com", body)
self.assertIn("INFORMATION UPDATED: Senior Official", body)
self.assertIn("INFORMATION UPDATED: Senior official", body)
@boto3_mocking.patching
@less_console_noise_decorator
@ -2219,9 +2219,9 @@ class TestDomainChangeNotifications(TestDomainOverview):
session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
# add nameservers
nameservers_page.form["form-0-server"] = "ns1-new.igorville.gov"
nameservers_page.form["form-0-server"] = "ns1-new.dns-needed.gov"
nameservers_page.form["form-0-ip"] = "192.168.1.1"
nameservers_page.form["form-1-server"] = "ns2-new.igorville.gov"
nameservers_page.form["form-1-server"] = "ns2-new.dns-needed.gov"
nameservers_page.form["form-1-ip"] = "192.168.1.2"
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)

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

@ -119,7 +119,6 @@ class DomainFormBaseView(DomainBaseView, FormMixin):
if form.is_valid():
return self.form_valid(form)
else:
logger.debug(f"Form errors: {form.errors}")
return self.form_invalid(form)
def form_valid(self, form):
@ -160,12 +159,12 @@ class DomainFormBaseView(DomainBaseView, FormMixin):
# send notification email for changes to any of these forms
form_label_dict = {
DomainSecurityEmailForm: "Security Email",
DomainSecurityEmailForm: "Security email",
DomainDnssecForm: "DNSSec",
DomainDsdataFormset: "DS Data",
DomainOrgNameAddressForm: "Org Name/Address",
SeniorOfficialContactForm: "Senior Official",
NameserverFormset: "Nameservers",
DomainDsdataFormset: "DNSSEC / DS Data",
DomainOrgNameAddressForm: "Organization details",
SeniorOfficialContactForm: "Senior official",
NameserverFormset: "Name servers",
}
# forms of these types should not send notifications if they're part of a portfolio/Organization
@ -182,6 +181,9 @@ class DomainFormBaseView(DomainBaseView, FormMixin):
info = self.get_domain_info_from_domain()
if not info or info.portfolio:
should_notify = False
elif "analyst_action" in self.session and "analyst_action_location" in self.session:
# action is being made by an analyst
should_notify = False
else:
# don't notify for any other types of forms
should_notify = False
@ -220,9 +222,16 @@ class DomainFormBaseView(DomainBaseView, FormMixin):
"user", flat=True
)
emails = list(User.objects.filter(pk__in=manager_pks).values_list("email", flat=True))
logger.debug("attempting to send templated email to domain managers")
try:
send_templated_email(template, subject_template, context=context, cc_addresses=emails)
# Remove the current user so they aren't CC'ed, since they will be the "to_address"
emails.remove(self.request.user.email)
except ValueError:
pass
try:
send_templated_email(
template, subject_template, to_address=self.request.user.email, context=context, cc_addresses=emails
)
except EmailSendingError:
logger.warning(
"Could not sent notification email to %s for domain %s",
@ -491,19 +500,25 @@ class DomainNameserversView(DomainFormBaseView):
self._get_domain(request)
formset = self.get_form()
logger.debug("got formet")
if "btn-cancel-click" in request.POST:
url = self.get_success_url()
return HttpResponseRedirect(url)
if formset.is_valid():
logger.debug("formset is valid")
return self.form_valid(formset)
else:
logger.debug("formset is invalid")
logger.debug(formset.errors)
return self.form_invalid(formset)
def form_valid(self, formset):
"""The formset is valid, perform something with it."""
self.request.session["nameservers_form_domain"] = self.object
initial_state = self.object.state
# Set the nameservers from the formset
nameservers = []
@ -544,7 +559,7 @@ class DomainNameserversView(DomainFormBaseView):
messages.error(self.request, NameserverError(code=nsErrorCodes.BAD_DATA))
logger.error(f"Registry error: {Err}")
else:
if self.object.state == Domain.State.READY:
if initial_state == Domain.State.READY:
self.send_update_notification(formset)
messages.success(
self.request,