From 0cd274491aa8bb273bf84c62ee1e810d161df7c4 Mon Sep 17 00:00:00 2001 From: lub Date: Sat, 13 Feb 2021 13:34:44 +0100 Subject: [PATCH] show flash messages again This basically restores the behaviour, that got removed in ecdf0c25b3d9bbaa028bdc46cb721d2fb406dde2 during refactoring. (cherry picked from commit 88f992de16ff6273b345136a0dca068c33cea9cc) # Conflicts: # core/admin/mailu/ui/templates/base.html --- core/admin/mailu/ui/templates/base.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/core/admin/mailu/ui/templates/base.html b/core/admin/mailu/ui/templates/base.html index 6484b355..9684badb 100644 --- a/core/admin/mailu/ui/templates/base.html +++ b/core/admin/mailu/ui/templates/base.html @@ -1,5 +1,10 @@ +<<<<<<< HEAD {%- import "macros.html" as macros %} {%- import "bootstrap/utils.html" as utils %} +======= +{% import "macros.html" as macros %} +{% import "bootstrap/utils.html" as utils %} +>>>>>>> 88f992de (show flash messages again) @@ -64,6 +69,18 @@ +<<<<<<< HEAD +======= +

+ {% block title %}{% endblock %} + {% block subtitle %}{% endblock %} +

+ + +
+ {{ utils.flashed_messages(container=False) }} + {% block content %}{% endblock %} +>>>>>>> 88f992de (show flash messages again)
{{ utils.flashed_messages(container=False, default_category='success') }}