From 1325355ca778b57067a14c377955f1d6ed74bfd4 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sat, 31 Jul 2021 13:14:31 +0200
Subject: [PATCH] revert flashbag wrapper class

---
 .../Resources/views/layout.html.twig          | 37 +++++++++++--------
 .../views/layoutWithVerticalMenu.html.twig    | 37 +++++++++++--------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 140557d69..3b1fe5041 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -53,23 +53,30 @@
         {% block sublayout_content %}
             <div class="row justify-content-center my-5">
 
-                {% for flashMessage in app.session.flashbag.get('success') %}
-                    <div class="col-8 mb-5 alert alert-success flash_message">
-                        <span>{{ flashMessage|raw }}</span>
-                    </div>
-                {% endfor %}
+                {# Flash messages ! #}
+                {% if app.session.flashbag.keys()|length > 0 %}
+                <div class="col-8 mb-5 flash_message">
 
-                {% for flashMessage in app.session.flashbag.get('error') %}
-                    <div class="col-8 mb-5 alert alert-danger flash_message">
-                        <span>{{ flashMessage|raw }}</span>
-                    </div>
-                {% endfor %}
+                    {% for flashMessage in app.session.flashbag.get('success') %}
+                        <div class="col-8 alert alert-success flash_message">
+                            <span>{{ flashMessage|raw }}</span>
+                        </div>
+                    {% endfor %}
 
-                {% for flashMessage in app.session.flashbag.get('notice') %}
-                    <div class="col-8 mb-5 alert alert-warning flash_message">
-                        <span>{{ flashMessage|raw }}</span>
-                    </div>
-                {% endfor %}
+                    {% for flashMessage in app.session.flashbag.get('error') %}
+                        <div class="col-8 alert alert-danger flash_message">
+                            <span>{{ flashMessage|raw }}</span>
+                        </div>
+                    {% endfor %}
+
+                    {% for flashMessage in app.session.flashbag.get('notice') %}
+                        <div class="col-8 alert alert-warning flash_message">
+                            <span>{{ flashMessage|raw }}</span>
+                        </div>
+                    {% endfor %}
+
+                </div>
+                {% endif %}
 
                 {% block content %}
                 <div class="col-8 main_search">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
index e11e5f51c..be582ab3b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig
@@ -27,23 +27,30 @@
     <div class="row">
         <div class="col-md-9 my-5">
 
-            {% for flashMessage in app.session.flashbag.get('success') %}
-                <div class="col-8 mb-5 alert alert-success flash_message">
-                    <span>{{ flashMessage|raw }}</span>
-                </div>
-            {% endfor %}
+            {# Flash messages ! #}
+            {% if app.session.flashbag.keys()|length > 0 %}
+            <div class="row justify-content-center mb-5">
 
-            {% for flashMessage in app.session.flashbag.get('error') %}
-                <div class="col-8 mb-5 alert alert-danger flash_message">
-                    <span>{{ flashMessage|raw }}</span>
-                </div>
-            {% endfor %}
+                {% for flashMessage in app.session.flashbag.get('success') %}
+                    <div class="col-8 alert alert-success flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
 
-            {% for flashMessage in app.session.flashbag.get('notice') %}
-                <div class="col-8 mb-5 alert alert-warning flash_message">
-                    <span>{{ flashMessage|raw }}</span>
-                </div>
-            {% endfor %}
+                {% for flashMessage in app.session.flashbag.get('error') %}
+                    <div class="col-8 alert alert-danger flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
+
+                {% for flashMessage in app.session.flashbag.get('notice') %}
+                    <div class="col-8 alert alert-warning flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
+
+            </div>
+            {% endif %}
 
             {% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
             {% endblock  %}