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

Remove unhelpful logic

Browse source
This commit is contained in:
zandercymatics 2024-09-30 10:04:29 -06:00
parent c084ec62f0
commit ff5212fb27
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 0 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/registrar/admin.py
View file

@ -1944,16 +1944,6 @@ 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)
# == Handle action_needed_reason == #
action_needed_reason_changed = obj.action_needed_reason != original_obj.action_needed_reason
if action_needed_reason_changed:
obj = self._handle_action_needed_reason(request, obj, original_obj)
# == Handle rejection_reason == #
rejection_reason_changed = obj.rejection_reason != original_obj.rejection_reason
if rejection_reason_changed:
obj = self._handle_rejection_reason(request, obj, original_obj)
# == Handle allowed emails == # # == Handle allowed emails == #
if obj.status in DomainRequest.get_statuses_that_send_emails() and not settings.IS_PRODUCTION: if obj.status in DomainRequest.get_statuses_that_send_emails() and not settings.IS_PRODUCTION:
self._check_for_valid_email(request, obj) self._check_for_valid_email(request, obj)
@ -1970,40 +1960,6 @@ 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_action_needed_reason(self, request, obj, original_obj):
# Track the fact that we sent out an email
request.session["action_needed_email_sent"] = True
# Set the action_needed_reason_email to the default if nothing exists.
# Since this check occurs after save, if the user enters a value then we won't update.
default_email = get_action_needed_reason_default_email(obj, obj.action_needed_reason)
if obj.action_needed_reason_email:
emails = get_all_action_needed_reason_emails(obj)
is_custom_email = obj.action_needed_reason_email not in emails.values()
if not is_custom_email:
obj.action_needed_reason_email = default_email
else:
obj.action_needed_reason_email = default_email
return obj
def _handle_rejection_reason(self, request, obj, original_obj):
# Track the fact that we sent out an email
request.session["rejection_reason_email_sent"] = True
# Set the rejection_reason_email to the default if nothing exists.
# Since this check occurs after save, if the user enters a value then we won't update.
default_email = get_rejection_reason_default_email(obj, obj.rejection_reason)
if obj.rejection_reason_email:
emails = get_all_rejection_reason_emails(obj)
is_custom_email = obj.rejection_reason_email not in emails.values()
if not is_custom_email:
obj.rejection_reason_email = default_email
else:
obj.rejection_reason_email = default_email
return obj
def _check_for_valid_email(self, request, obj): def _check_for_valid_email(self, request, obj):
"""Certain emails are whitelisted in non-production environments, """Certain emails are whitelisted in non-production environments,
so we should display that information using this function. so we should display that information using this function.