diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js index 24f020b75..b24e946dc 100644 --- a/src/registrar/assets/js/get-gov-admin.js +++ b/src/registrar/assets/js/get-gov-admin.js @@ -519,7 +519,6 @@ function initializeWidgetOnList(list, parentId) { var actionNeededEmailReadonlyTextarea = document.querySelector("#action-needed-reason-email-readonly-textarea") // Edit e-mail modal (and its confirmation button) - var actionNeededEmailAlreadySentModal = document.querySelector("#email-already-sent-modal") var confirmEditEmailButton = document.querySelector("#email-already-sent-modal_continue-editing-button") // Headers and footers (which change depending on if the e-mail was sent or not) @@ -561,11 +560,11 @@ function initializeWidgetOnList(list, parentId) { updateActionNeededEmailDisplay(reason) }); - editEmailButton.addEventListener("click", function() { - if (!checkEmailAlreadySent()) { - showEmail(canEdit=true) - } - }); + // editEmailButton.addEventListener("click", function() { + // if (!checkEmailAlreadySent()) { + // showEmail(canEdit=true) + // } + // }); confirmEditEmailButton.addEventListener("click", function() { // Show editable view diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index f7d1e5788..e2377e07c 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -546,7 +546,7 @@ button .usa-icon, #submitRowToggle { color: var(--body-fg); } - .requested-domain-sticky { + .submit-row-sticky { max-width: 325px; overflow: hidden; white-space: nowrap; diff --git a/src/registrar/fixtures_users.py b/src/registrar/fixtures_users.py index 8be3e13a2..1b8eda9ab 100644 --- a/src/registrar/fixtures_users.py +++ b/src/registrar/fixtures_users.py @@ -295,7 +295,7 @@ class UserFixture: logger.warning(f"Could not add email to whitelist for {first_name} {last_name}.") # Load additional emails - allowed_emails.extend(additional_emails) + allowed_emails.extend([AllowedEmail(email=email) for email in additional_emails]) if allowed_emails: AllowedEmail.objects.bulk_create(allowed_emails) diff --git a/src/registrar/templates/django/admin/domain_request_change_form.html b/src/registrar/templates/django/admin/domain_request_change_form.html index a7d59d22c..0396326d9 100644 --- a/src/registrar/templates/django/admin/domain_request_change_form.html +++ b/src/registrar/templates/django/admin/domain_request_change_form.html @@ -120,7 +120,7 @@ -
+
Requested domain: {{ original.requested_domain.name }}
{{ block.super }} diff --git a/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html b/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html index 5ec5a4906..602935ab7 100644 --- a/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html +++ b/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html @@ -1,4 +1,4 @@ -This table is an email whitelist for non-production environments.
+This table is an email allow list for non-production environments.
If an email is sent out and the email does not exist within this table (or is not a subset of it), then no email will be sent. diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html index 3b4047d39..1c1a7c2a9 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -330,7 +330,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% endif %} {% endwith %} - {% elif field.field.name == "state_territory" %} + {% elif field.field.name == "state_territory" and original_object|model_name_lowercase != 'portfolio' %}
+ Organization Name: {{ original.organization_name }} +
+ {{ block.super }} +