Fix modals of actions with confirmation messages and rendered as forms

Author: javiereguiluz

assets/js/app.js

@@ -440,20 +440,33 @@ class App {
                 modalButton.addEventListener(
                     'click',
                     () => {
-                        // check if this is a POST action (like DELETE with formaction) or GET (link href)
+                        // Case 1: POST action with formaction (like DELETE with CSRF token)
                         const formAction = actionElement.getAttribute('formaction');
-
                         if (formAction) {
-                            // POST action: use the hidden form with CSRF token (like DELETE)
                             const form = document.querySelector('#action-confirmation-form');
                             form.setAttribute('action', formAction);
                             form.submit();
-                        } else {
-                            // GET action: navigate to the href URL
-                            const href = actionElement.getAttribute('href');
-                            if (href) {
-                                window.location.href = href;
-                            }
+                            return;
+                        }
+
+                        // Case 2: dropdown action rendered as form (data-ea-action-form-id)
+                        const actionFormId = actionElement.getAttribute('data-ea-action-form-id');
+                        if (actionFormId) {
+                            document.getElementById(actionFormId).submit();
+                            return;
+                        }
+
+                        // Case 3: standalone button inside a <form> (renderAsForm)
+                        const parentForm = actionElement.closest('form');
+                        if (parentForm && parentForm.hasAttribute('action')) {
+                            parentForm.submit();
+                            return;
+                        }
+
+                        // Case 4: GET action with href
+                        const href = actionElement.getAttribute('href');
+                        if (href) {
+                            window.location.href = href;
                         }
                     },
                     { once: true }
@@ -609,17 +622,25 @@ class App {
 
     #createActionHandlers() {
         // handle form submissions via data attribute (replaces inline onclick handlers)
+        // skip elements with confirmation modals (handled by #createActionConfirmationModals)
         document.querySelectorAll('[data-ea-action-form-id]').forEach((element) => {
             element.addEventListener('click', (event) => {
+                if (element.hasAttribute('data-action-confirmation')) {
+                    return;
+                }
                 event.preventDefault();
                 const formId = element.getAttribute('data-ea-action-form-id');
                 document.getElementById(formId).submit();
             });
         });
 
         // handle navigation via data attribute (replaces inline onclick handlers)
+        // skip elements with confirmation modals (handled by #createActionConfirmationModals)
         document.querySelectorAll('[data-ea-action-url]').forEach((element) => {
             element.addEventListener('click', (event) => {
+                if (element.hasAttribute('data-action-confirmation')) {
+                    return;
+                }
                 event.preventDefault();
                 window.location = element.getAttribute('data-ea-action-url');
             });

public/app.8f681b52.js public/app.eff2bb42.jspublic/app.8f681b52.js renamed to public/app.eff2bb42.js

@@ -5,7 +5,7 @@
         "/app.98533a09.css"
       ],
       "js": [
-        "/app.8f681b52.js"
+        "/app.eff2bb42.js"
       ]
     },
     "form": {

public/app.8f681b52.js.LICENSE.txt public/app.eff2bb42.js.LICENSE.txtpublic/app.8f681b52.js.LICENSE.txt renamed to public/app.eff2bb42.js.LICENSE.txt

@@ -1,6 +1,6 @@
 {
   "app.css": "app.98533a09.css",
-  "app.js": "app.8f681b52.js",
+  "app.js": "app.eff2bb42.js",
   "form.js": "form.5bccac01.js",
   "page-layout.js": "page-layout.6e9fe55d.js",
   "page-color-scheme.js": "page-color-scheme.e3fe1a0a.js",