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

Cleanup

Browse source
This commit is contained in:
zandercymatics 2024-07-08 14:29:36 -06:00
parent 425cfbcb4e
commit 91b9cb4379
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/registrar/admin.py
View file

@ -1735,17 +1735,12 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
# Get the original domain request from the database. # Get the original domain request from the database.
original_obj = models.DomainRequest.objects.get(pk=obj.pk) original_obj = models.DomainRequest.objects.get(pk=obj.pk)
# If the reason is in a state where we can send out an email,
# set the email to a default one if a custom email isn't provided.
if obj.action_needed_reason and obj.action_needed_reason != obj.ActionNeededReasons.OTHER: if obj.action_needed_reason and obj.action_needed_reason != obj.ActionNeededReasons.OTHER:
text = self._get_action_needed_reason_default_email(obj, obj.action_needed_reason) obj = self._handle_existing_action_needed_reason_email(obj, original_obj)
body_text = text.get("email_body_text") else:
reason_changed = obj.action_needed_reason != original_obj.action_needed_reason
is_default_email = body_text == obj.action_needed_reason_email
if body_text and is_default_email and reason_changed:
obj.action_needed_reason_email = body_text
should_save = True
elif not obj.action_needed_reason and obj.action_needed_reason_email:
obj.action_needed_reason_email = None obj.action_needed_reason_email = None
should_save = True
if obj.status == original_obj.status: if obj.status == original_obj.status:
# If the status hasn't changed, let the base function take care of it # If the status hasn't changed, let the base function take care of it
@ -1759,6 +1754,24 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
if should_save: if should_save:
return super().save_model(request, obj, form, change) return super().save_model(request, obj, form, change)
def _handle_existing_action_needed_reason_email(self, obj, original_obj):
"""
Changes the action_needed_reason to the default email.
This occurs if the email changes and if it is empty.
"""
# Get the default email
text = self._get_action_needed_reason_default_email(obj, obj.action_needed_reason)
body_text = text.get("email_body_text")
# Set the action_needed_reason_email to the default
reason_changed = obj.action_needed_reason != original_obj.action_needed_reason
is_default_email = body_text == obj.action_needed_reason_email
if body_text and is_default_email and reason_changed:
obj.action_needed_reason_email = body_text
return obj
def _handle_status_change(self, request, obj, original_obj): def _handle_status_change(self, request, obj, original_obj):
""" """
Checks for various conditions when a status change is triggered. Checks for various conditions when a status change is triggered.
@ -1968,9 +1981,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
if domain_request.action_needed_reason == enum_value and domain_request.action_needed_reason_email: if domain_request.action_needed_reason == enum_value and domain_request.action_needed_reason_email:
custom_text = domain_request.action_needed_reason_email custom_text = domain_request.action_needed_reason_email
emails[enum_value] = self._get_action_needed_reason_default_email( emails[enum_value] = self._get_action_needed_reason_default_email(domain_request, enum_value, custom_text)
domain_request, enum_value, custom_text
)
return json.dumps(emails) return json.dumps(emails)
def _get_action_needed_reason_default_email(self, domain_request, action_needed_reason: str, custom_text=None): def _get_action_needed_reason_default_email(self, domain_request, action_needed_reason: str, custom_text=None):

1
src/registrar/models/domain_request.py
View file

@ -1,7 +1,6 @@
from __future__ import annotations from __future__ import annotations
from typing import Union from typing import Union
import logging import logging
from django.template.loader import get_template
from django.apps import apps from django.apps import apps
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models