mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-14 15:05:14 +02:00
restored if statement (not sure why it dissappeared)
This commit is contained in:
parent
5462335416
commit
2733a9045c
2 changed files with 10 additions and 5 deletions
|
@ -32,8 +32,9 @@ def send_templated_email(
|
||||||
template_name and subject_template_name are relative to the same template
|
template_name and subject_template_name are relative to the same template
|
||||||
context as Django's HTML templates. context gives additional information
|
context as Django's HTML templates. context gives additional information
|
||||||
that the template may use.
|
that the template may use.
|
||||||
|
|
||||||
|
Raises EmailSendingError if SES client could not be accessed
|
||||||
"""
|
"""
|
||||||
logger.info(f"An email was sent! Template name: {template_name} to {to_address}")
|
|
||||||
template = get_template(template_name)
|
template = get_template(template_name)
|
||||||
email_body = template.render(context=context)
|
email_body = template.render(context=context)
|
||||||
|
|
||||||
|
@ -48,7 +49,9 @@ def send_templated_email(
|
||||||
aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
|
aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
|
||||||
config=settings.BOTO_CONFIG,
|
config=settings.BOTO_CONFIG,
|
||||||
)
|
)
|
||||||
|
logger.info(f"An email was sent! Template name: {template_name} to {to_address}")
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
|
logger.debug(f"E-mail unable to send! Could not access the SES client.")
|
||||||
raise EmailSendingError("Could not access the SES client.") from exc
|
raise EmailSendingError("Could not access the SES client.") from exc
|
||||||
|
|
||||||
destination = {"ToAddresses": [to_address]}
|
destination = {"ToAddresses": [to_address]}
|
||||||
|
|
|
@ -778,7 +778,9 @@ class DomainAddUserView(DomainFormBaseView):
|
||||||
"""Make a Domain invitation for this email and redirect with a message."""
|
"""Make a Domain invitation for this email and redirect with a message."""
|
||||||
# Check to see if an invite has already been sent (NOTE: we do not want to create an invite just yet.)
|
# Check to see if an invite has already been sent (NOTE: we do not want to create an invite just yet.)
|
||||||
try:
|
try:
|
||||||
|
invite = DomainInvitation.objects.get(email=email_address, domain=self.object)
|
||||||
# that invitation already existed
|
# that invitation already existed
|
||||||
|
if invite is not None:
|
||||||
messages.warning(
|
messages.warning(
|
||||||
self.request,
|
self.request,
|
||||||
f"{email_address} has already been invited to this domain.",
|
f"{email_address} has already been invited to this domain.",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue