diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 811946549..160b906ab 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -1485,7 +1485,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin): "status", "rejection_reason", "action_needed_reason", - "action_needed_reason_email", "investigator", "creator", "submitter", diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js index 83348ca7f..04dc04dac 100644 --- a/src/registrar/assets/js/get-gov-admin.js +++ b/src/registrar/assets/js/get-gov-admin.js @@ -546,25 +546,17 @@ function initializeWidgetOnList(list, parentId) { (function () { let statusDropdown = document.getElementById("id_status"); let actionNeededReasonDropdown = document.getElementById("id_action_needed_reason"); - let actionNeededEmail = document.getElementById("id_action_needed_reason_email") - let reasonFormRow = actionNeededEmail.closest(".form-row"); - - if(actionNeededReasonDropdown && actionNeededEmail && reasonFormRow) { - statusDropdown.addEventListener('change', function() { - if (statusDropdown.value != "action needed") { - // Hide the email field by default - hideElement(reasonFormRow) - }else { - showElement(reasonFormRow) - } - }); + // If you need to account for the non-readonly version as well, you will need to check + // for both of these things seperately. + let actionNeededEmail = document.querySelector("#action_needed_reason_email_view_more") + if(actionNeededReasonDropdown && actionNeededEmail) { if (statusDropdown.value == "action needed") - handleChangeActionNeededEmail(actionNeededReasonDropdown, actionNeededEmail, reasonFormRow); + handleChangeActionNeededEmail(actionNeededReasonDropdown, actionNeededEmail); } // TODO fix edge case where nothing is selected - function handleChangeActionNeededEmail(actionNeededReasonDropdown, actionNeededEmail, reasonFormRow) { + function handleChangeActionNeededEmail(actionNeededReasonDropdown, actionNeededEmail) { actionNeededReasonDropdown.addEventListener('change', function() { // TODO on change if not actionneeded on status, hide show email button const pk = document.querySelector("#domain_request_id").value @@ -603,8 +595,6 @@ function initializeWidgetOnList(list, parentId) { // Show the message showElement(noEmailMessage); } - - showElement(reasonFormRow) }); }); diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index 360055d91..0248d33b7 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -786,3 +786,12 @@ div.dja__model-description{ .usa-button--dja-link-color { color: var(--link-fg); } + +// If the dja textarea is set as readonly, display this on hover +textarea.vLargeTextField[readonly]:hover { + cursor: not-allowed; +} + +.max-full { + width: 100% !important; +} \ No newline at end of file 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 a7c50a810..5e162f8e8 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -105,34 +105,24 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% endfor %} + + {% if original_object.action_needed_reason_email %} +
+ + +
+ {% endif %} + - {% comment %} -
-
  • - -
  • -
  • - -
  • -
    - {% endcomment %} {% elif field.field.name == "creator" %}