Merge pull request #593 from bitzesty/supporters

Fix deletion of support letter attachments
bitzesty · Sep 12, 2023 · e8a780e · e8a780e
2 parents bf016cd + d51b08d
commit e8a780e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/app/views/form/support_letters/_support_letter.html.slim b/app/views/form/support_letters/_support_letter.html.slim
@@ -31,4 +31,4 @@ li.view-only
                                                                 mount_name: :attachment
   span.clear
 
-  = button_to "Remove", form_form_answer_support_letter_path(@form_answer, support_letter), method: :delete, class: "govuk-button govuk-button--warning #{'read_only' if admin_in_read_only_mode?}", 'aria-label' => "Delete support letter from #{support_letter.first_name} #{support_letter.first_name}"
+  = button_to "Remove", form_form_answer_support_letter_path(@form_answer, support_letter), method: :delete, class: "govuk-button govuk-button--warning #{'read_only' if admin_in_read_only_mode?}", 'aria-label' => "Delete support letter from #{support_letter.first_name} #{support_letter.last_name}"
diff --git a/app/views/qae_form/_supporter_fields.html.slim b/app/views/qae_form/_supporter_fields.html.slim
@@ -50,6 +50,4 @@ li.js-add-example class="#{'read-only js-support-letter-received' if persisted}"
       - url = "#"
 
     - if submission_deadline.trigger_at >= Time.zone.now
-      button.govuk-button.govuk-button--warning.remove-supporter.remove-link.js-remove-link.visible-read-only class="#{'read_only' if admin_in_read_only_mode?}"
-        | Remove
-
+      = link_to "Remove", url, class: "govuk-button govuk-button--warning remove-supporter remove-link js-remove-link", data: { url: url }, 'aria-label' => "Delete support letter from #{supporter["first_name"]} #{supporter["last_name"]}"
diff --git a/app/views/qae_form/_supporter_fields_placeholder.html.slim b/app/views/qae_form/_supporter_fields_placeholder.html.slim
@@ -30,8 +30,3 @@ li.js-add-example class="govuk-!-display-none"
 
   button.govuk-button.button-alt.js-save-collection data-save-collection-url=users_form_answer_support_letters_url(@form_answer) disabled='disabled'
     | Submit letter of support
-
-  p
-    - if !admin_in_read_only_mode?
-      button.govuk-button.govuk-button--warning.remove-supporter.remove-link.js-remove-link.govuk-button.govuk-button--warning.visible-read-only
-        | Remove