From c5496655785c9f88a88ffc9b87dbd7ec84c62470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Wed, 4 Mar 2026 23:24:29 +0100
Subject: [PATCH] Fixed flash messages in admin pages

---
 templates/_turbo_control.html.twig   | 20 ++++++++------------
 templates/admin/base_admin.html.twig |  5 +----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/templates/_turbo_control.html.twig b/templates/_turbo_control.html.twig
index 281b21f2..a9f78c2e 100644
--- a/templates/_turbo_control.html.twig
+++ b/templates/_turbo_control.html.twig
@@ -1,23 +1,19 @@
 {% block flashes %}
     {# Insert flashes #}
-    <turbo-stream action="replace" action="morph" target="toast-container">
+    <turbo-stream action="update" action="morph" target="toast-container">
         <template>
-            <div class="toast-container" id="toast-container">
-                {% for label, messages in app.flashes() %}
-                    {% for message in messages %}
-                        {{ include('_toast.html.twig', {
-                            'label': label,
-                            'message': message
-                        }) }}
-                    {% endfor %}
+            {% for label, messages in app.flashes() %}
+                {% for message in messages %}
+                    {{ include('_toast.html.twig', {
+                        'label': label,
+                        'message': message
+                    }) }}
                 {% endfor %}
-            </div>
+            {% endfor %}
         </template>
     </turbo-stream>
 {% endblock %}
 
-
-
 {# Insert info about when the sidebar trees were updated last time, so the sidebar_tree_controller can decide if it needs to reload the tree #}
 <span id="sidebar-last-time-updated" style="display: none;" data-last-update="{{ sidebar_tree_updater.lastTreeUpdate.format("Y-m-d\\TH:i:sP") }}"></span>
 
diff --git a/templates/admin/base_admin.html.twig b/templates/admin/base_admin.html.twig
index e9fc0fb9..f710981d 100644
--- a/templates/admin/base_admin.html.twig
+++ b/templates/admin/base_admin.html.twig
@@ -195,10 +195,7 @@
                             {% endif %}
                         </div>
                     </fieldset>
-
-                    {# Include turbo control things, so we can still control page title and reloading #}
-                    {% include "_turbo_control.html.twig" %}
                 </turbo-frame>
             </div>
         </div>
-    {% endblock %}
\ No newline at end of file
+    {% endblock %}