Merge branch 'main' into za/2402-design-review

This commit is contained in:
zandercymatics 2024-09-23 10:16:20 -06:00
commit afe498978c
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
80 changed files with 2896 additions and 1532 deletions

View file

@ -1923,11 +1923,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
so we should display that information using this function.
"""
if hasattr(obj, "creator"):
recipient = obj.creator
else:
recipient = None
recipient = obj.creator
# Displays a warning in admin when an email cannot be sent
if recipient and recipient.email:
@ -2132,7 +2128,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
extra_context["filtered_audit_log_entries"] = filtered_audit_log_entries
emails = self.get_all_action_needed_reason_emails(obj)
extra_context["action_needed_reason_emails"] = json.dumps(emails)
extra_context["has_profile_feature_flag"] = flag_is_active(request, "profile_feature")
# Denote if an action needed email was sent or not
email_sent = request.session.get("action_needed_email_sent", False)