Define the flash_messages block in the containing templates

EasyCorp · Sep 2, 2015 · 9fb4c04 · 9fb4c04
1 parent a92239a
commit 9fb4c04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/Resources/views/default/flash_messages.html.twig b/Resources/views/default/flash_messages.html.twig
@@ -1,13 +1,11 @@
-{% block flash_messages %}
-    {% if app.session.started %}
-        <div id="flash-messages">
-            {% for label, messages in app.session.flashbag.all %}
-                {% for message in messages %}
-                    <div class="alert alert-{{ label }}">
-                        {{ message }}
-                    </div>
-                {% endfor %}
+{% if app.session.started %}
+    <div id="flash-messages">
+        {% for label, messages in app.session.flashbag.all %}
+            {% for message in messages %}
+                <div class="alert alert-{{ label }}">
+                    {{ message }}
+                </div>
             {% endfor %}
-        </div>
-    {% endif %}
-{% endblock %}
+        {% endfor %}
+    </div>
+{% endif %}
diff --git a/Resources/views/default/layout.html.twig b/Resources/views/default/layout.html.twig
@@ -83,7 +83,9 @@
 
         <div id="content" class="col-lg-10 col-lg-offset-2">
             {% block content %}
-                {{ include(_entity_config.templates.flash_messages) }}
+                {% block flash_messages %}
+                    {{ include(_entity_config.templates.flash_messages) }}
+                {% endblock flash_messages %}
 
                 <div class="row">
                     <div id="content-header" class="col-sm-12">

diff --git a/Resources/views/default/list.html.twig b/Resources/views/default/list.html.twig
@@ -36,7 +36,9 @@
 
     {% set _request_parameters = _request_parameters|merge({ referer: path('admin', _request_parameters)|url_encode }) %}
 
-    {{ include(_entity_config.templates.flash_messages) }}
+    {% block flash_messages %}
+        {{ include(_entity_config.templates.flash_messages) }}
+    {% endblock flash_messages %}
 
     <div class="row">
         <div id="content-header" class="col-sm-12">