From 89f8f91a4b4fc2574856312c136901f8cf02389f Mon Sep 17 00:00:00 2001
From: jordi fita mas <jordi@tandem.blog>
Date: Tue, 16 Jan 2024 18:32:02 +0100
Subject: [PATCH] Avoid nested forms in admin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I was using a <form> to delete slides and other such elements before
adding the form to sort these same elements with drag and drop, without
realizing that i was wrapping the existing delete <form>s, that now
would not submit properly—they were submitting the sort form instead.
---
 .../admin/campsite/carousel/index.gohtml      | 10 +++++-----
 web/templates/admin/home/index.gohtml         | 10 +++++-----
 web/templates/admin/services/index.gohtml     | 20 +++++++++----------
 web/templates/admin/surroundings/index.gohtml | 10 +++++-----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/web/templates/admin/campsite/carousel/index.gohtml b/web/templates/admin/campsite/carousel/index.gohtml
index 741e095..0831362 100644
--- a/web/templates/admin/campsite/carousel/index.gohtml
+++ b/web/templates/admin/campsite/carousel/index.gohtml
@@ -39,11 +39,11 @@
                         </td>
                         <td><a href="/admin/campsites/types/{{ $.TypeSlug }}/slides/{{ .ID }}">{{ .Caption }}</a></td>
                         <td>
-                            <form data-hx-delete="/admin/campsites/types/{{ $.TypeSlug }}/slides/{{ .ID }}"
-                                  data-hx-confirm="{{ $confirm }}"
-                                  data-hx-headers='{ {{ CSRFHeader }} }'>
-                                <button type="submit">{{( pgettext "Delete" "action" )}}</button>
-                            </form>
+                            <button data-hx-delete="/admin/campsites/types/{{ $.TypeSlug }}/slides/{{ .ID }}"
+                                    data-hx-confirm="{{ $confirm }}"
+                                    data-hx-headers='{ {{ CSRFHeader }} }'>
+                                {{( pgettext "Delete" "action" )}}
+                            </button>
                         </td>
                     </tr>
                 {{- end }}
diff --git a/web/templates/admin/home/index.gohtml b/web/templates/admin/home/index.gohtml
index 3613e84..5304e60 100644
--- a/web/templates/admin/home/index.gohtml
+++ b/web/templates/admin/home/index.gohtml
@@ -38,11 +38,11 @@
                         </td>
                         <td><a href="/admin/home/slides/{{ .ID }}">{{ .Caption }}</a></td>
                         <td>
-                            <form data-hx-delete="/admin/home/slides/{{ .ID }}"
-                                  data-hx-confirm="{{ $confirm }}"
-                                  data-hx-headers='{ {{ CSRFHeader }} }'>
-                                <button type="submit">{{( pgettext "Delete" "action" )}}</button>
-                            </form>
+                            <button data-hx-delete="/admin/home/slides/{{ .ID }}"
+                                    data-hx-confirm="{{ $confirm }}"
+                                    data-hx-headers='{ {{ CSRFHeader }} }'>
+                                {{( pgettext "Delete" "action" )}}
+                            </button>
                         </td>
                     </tr>
                 {{- end }}
diff --git a/web/templates/admin/services/index.gohtml b/web/templates/admin/services/index.gohtml
index efc30f0..6a7c308 100644
--- a/web/templates/admin/services/index.gohtml
+++ b/web/templates/admin/services/index.gohtml
@@ -38,11 +38,11 @@
                         </td>
                         <td><a href="/admin/services/slides/{{ .ID }}">{{ .Caption }}</a></td>
                         <td>
-                            <form data-hx-delete="/admin/services/slides/{{ .ID }}"
-                                  data-hx-confirm="{{ $confirm }}"
-                                  data-hx-headers='{ {{ CSRFHeader }} }'>
-                                <button type="submit">{{( pgettext "Delete" "action" )}}</button>
-                            </form>
+                            <button data-hx-delete="/admin/services/slides/{{ .ID }}"
+                                    data-hx-confirm="{{ $confirm }}"
+                                    data-hx-headers='{ {{ CSRFHeader }} }'>
+                                {{( pgettext "Delete" "action" )}}
+                            </button>
                         </td>
                     </tr>
                 {{- end }}
@@ -82,11 +82,11 @@
                         </td>
                         <td class="icon_{{ .Icon }}"><a href="{{ .URL }}">{{ .Name }}</a></td>
                         <td>
-                            <form data-hx-delete="{{ .URL }}"
-                                  data-hx-confirm="{{ $confirm }}"
-                                  data-hx-headers='{ {{ CSRFHeader }} }'>
-                                <button type="submit">{{( pgettext "Delete" "action" )}}</button>
-                            </form>
+                            <button data-hx-delete="{{ .URL }}"
+                                    data-hx-confirm="{{ $confirm }}"
+                                    data-hx-headers='{ {{ CSRFHeader }} }'>
+                                {{( pgettext "Delete" "action" )}}
+                            </button>
                         </td>
                     </tr>
                 {{- end }}
diff --git a/web/templates/admin/surroundings/index.gohtml b/web/templates/admin/surroundings/index.gohtml
index eca20cc..dc8d0a8 100644
--- a/web/templates/admin/surroundings/index.gohtml
+++ b/web/templates/admin/surroundings/index.gohtml
@@ -38,11 +38,11 @@
                         </td>
                         <td><a href="{{ .URL }}">{{ .Name }}</a></td>
                         <td>
-                            <form data-hx-delete="/admin/surroundings//{{ .ID }}"
-                                  data-hx-confirm="{{ $confirm }}"
-                                  data-hx-headers='{ {{ CSRFHeader }} }'>
-                                <button type="submit">{{( pgettext "Delete" "action" )}}</button>
-                            </form>
+                            <button data-hx-delete="/admin/surroundings//{{ .ID }}"
+                                    data-hx-confirm="{{ $confirm }}"
+                                    data-hx-headers='{ {{ CSRFHeader }} }'>
+                                {{( pgettext "Delete" "action" )}}
+                            </button>
                         </td>
                     </tr>
                 {{- end }}