From e4285bbc7862f55db42c78e132d86fe2295595da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Mon, 15 May 2023 00:34:06 +0200
Subject: [PATCH] delete_btn_controller: Keep the value and name of the
 original clicked button

This fixes an error message when undoing or reverting a log entry
---
 assets/controllers/elements/delete_btn_controller.js | 9 +++++++++
 templates/log_system/details/helper.macro.html.twig  | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/assets/controllers/elements/delete_btn_controller.js b/assets/controllers/elements/delete_btn_controller.js
index b688605b..1b28de13 100644
--- a/assets/controllers/elements/delete_btn_controller.js
+++ b/assets/controllers/elements/delete_btn_controller.js
@@ -44,6 +44,7 @@ export default class extends Controller
         const title = this.element.dataset.deleteTitle;
 
         const form = this.element;
+        const submitter = event.submitter;
         const that = this;
 
         const confirm = bootbox.confirm({
@@ -58,6 +59,14 @@ export default class extends Controller
                     const submit_btn = document.createElement('button');
                     submit_btn.type = 'submit';
                     submit_btn.style.display = 'none';
+
+                    //If the clicked button has a value, set it on the submit button
+                    if (submitter.value) {
+                        submit_btn.value = submitter.value;
+                    }
+                    if (submitter.name) {
+                        submit_btn.name = submitter.name;
+                    }
                     form.appendChild(submit_btn);
                     submit_btn.click();
                 } else {
diff --git a/templates/log_system/details/helper.macro.html.twig b/templates/log_system/details/helper.macro.html.twig
index e9d59948..cc6fedd6 100644
--- a/templates/log_system/details/helper.macro.html.twig
+++ b/templates/log_system/details/helper.macro.html.twig
@@ -19,8 +19,8 @@
 
     <form method="post" action="{{ path("log_undo") }}"
             {{ stimulus_controller('elements/delete_btn') }} {{ stimulus_action('elements/delete_btn', "submit", "submit") }}
-          data-delete-title="{% trans %}log.undo.confirm_title{% endtrans %}"
-          data-delete-message="{% trans %}log.undo.confirm_message{% endtrans %}">
+            data-delete-title="{% trans %}log.undo.confirm_title{% endtrans %}"
+            data-delete-message="{% trans %}log.undo.confirm_message{% endtrans %}">
 
         <input type="hidden" name="redirect_back" value="{{ app.request.requestUri }}">