From afb9cce2677d8e2f42a46225c183e94bbdc77501 Mon Sep 17 00:00:00 2001
From: Camille Daniel <camille@yaal.coop>
Date: Thu, 29 Jul 2021 11:50:13 +0200
Subject: [PATCH] Move flask.messages() to base.html to avoid forgotten pages
 and message displayed on the wrong page

---
 canaille/templates/about.html                    | 2 --
 canaille/templates/admin/authorization_view.html | 3 ---
 canaille/templates/admin/client_add.html         | 3 ---
 canaille/templates/admin/client_edit.html        | 3 ---
 canaille/templates/admin/client_list.html        | 3 ---
 canaille/templates/admin/token_view.html         | 3 ---
 canaille/templates/base.html                     | 3 +++
 canaille/templates/consent_list.html             | 3 ---
 canaille/templates/firstlogin.html               | 3 ---
 canaille/templates/forgotten-password.html       | 3 ---
 canaille/templates/group.html                    | 3 ---
 canaille/templates/groups.html                   | 3 ---
 canaille/templates/login.html                    | 3 ---
 canaille/templates/password.html                 | 3 ---
 canaille/templates/profile.html                  | 3 ---
 canaille/templates/reset-password.html           | 3 ---
 canaille/templates/users.html                    | 3 ---
 17 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/canaille/templates/about.html b/canaille/templates/about.html
index a369d4cd..d631471b 100644
--- a/canaille/templates/about.html
+++ b/canaille/templates/about.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="ui clearing segment">
@@ -8,7 +7,6 @@
         <img class="ui tiny centered image" src="/static/img/canaille-head.png" alt="{{ website_name }}">
     </a>
 
-    {{ flask.messages() }}
     <h2 class="ui center aligned header">
         <div class="content">
             {{ _("About canaille") }}
diff --git a/canaille/templates/admin/authorization_view.html b/canaille/templates/admin/authorization_view.html
index 11192da5..3424a132 100644
--- a/canaille/templates/admin/authorization_view.html
+++ b/canaille/templates/admin/authorization_view.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="loginform">
@@ -8,8 +7,6 @@
         {% trans %}View a authorization{% endtrans %}
     </h3>
 
-    {{ flask.messages() }}
-
     <div class="ui attached clearing segment">
         <ul>
         {% for attr in authorization.may %}
diff --git a/canaille/templates/admin/client_add.html b/canaille/templates/admin/client_add.html
index de08ce21..e628f4e2 100644
--- a/canaille/templates/admin/client_add.html
+++ b/canaille/templates/admin/client_add.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="loginform">
@@ -8,8 +7,6 @@
         {% trans %}Add a client{% endtrans %}
     </h3>
 
-    {{ flask.messages() }}
-
     <div class="ui attached clearing segment">
         {{ sui.render_form(form, _("Confirm")) }}
     </div>
diff --git a/canaille/templates/admin/client_edit.html b/canaille/templates/admin/client_edit.html
index 71d18ced..9edd16e3 100644
--- a/canaille/templates/admin/client_edit.html
+++ b/canaille/templates/admin/client_edit.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block script %}
     <script src="/static/js/admin/client_edit.js"></script>
@@ -26,8 +25,6 @@
         {% trans %}Edit a client{% endtrans %}
     </h3>
 
-    {{ flask.messages() }}
-
     <div class="ui attached clearing segment">
         <div class="ui form">
             <form id="readonly">
diff --git a/canaille/templates/admin/client_list.html b/canaille/templates/admin/client_list.html
index b4a61da4..0152d9a6 100644
--- a/canaille/templates/admin/client_list.html
+++ b/canaille/templates/admin/client_list.html
@@ -1,5 +1,4 @@
 {% extends 'base.html' %}
-{% import 'flask.j2' as flask %}
 
 {% block style %}
     <link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet">
@@ -14,8 +13,6 @@
 
 {% block content %}
 
-{{ flask.messages() }}
-
 <div class="ui segment">
     <a class="ui primary button" href="{{ url_for('admin_clients.add') }}">{% trans %}Add client{% endtrans %}</a>
 </div>
diff --git a/canaille/templates/admin/token_view.html b/canaille/templates/admin/token_view.html
index b7d567b4..2d8980c1 100644
--- a/canaille/templates/admin/token_view.html
+++ b/canaille/templates/admin/token_view.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="loginform">
@@ -8,8 +7,6 @@
         {% trans %}View a token{% endtrans %}
     </h3>
 
-    {{ flask.messages() }}
-
     <div class="ui attached clearing segment">
         <ul>
         {% for attr in token.may %}
diff --git a/canaille/templates/base.html b/canaille/templates/base.html
index 62dd8b2c..4d8198dd 100644
--- a/canaille/templates/base.html
+++ b/canaille/templates/base.html
@@ -1,3 +1,5 @@
+{% import 'flask.j2' as flask %}
+
 <!doctype html>
 <html lang="fr">
 <head>
@@ -87,6 +89,7 @@
 
     <div class="ui container">
         <div class="content">
+            {{ flask.messages() }}
             {% block content %}{% endblock %}
         </div>
     </div>
diff --git a/canaille/templates/consent_list.html b/canaille/templates/consent_list.html
index f182b7c4..14380fd9 100644
--- a/canaille/templates/consent_list.html
+++ b/canaille/templates/consent_list.html
@@ -1,5 +1,4 @@
 {% extends 'base.html' %}
-{% import 'flask.j2' as flask %}
 
 {% block style %}
     <link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet">
@@ -23,8 +22,6 @@
         </div>
     </h2>
 
-    {{ flask.messages() }}
-
     {% if consents %}
     <div class="ui centered cards">
         {% for consent in consents %}
diff --git a/canaille/templates/firstlogin.html b/canaille/templates/firstlogin.html
index 4c9103f3..b9cb948f 100644
--- a/canaille/templates/firstlogin.html
+++ b/canaille/templates/firstlogin.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="loginform">
@@ -13,8 +12,6 @@
         </div>
     </h3>
 
-    {{ flask.messages() }}
-
     <div class="ui attached message">
         {% trans %}
         It seems this is the first time you are logging here. In order to finalize your
diff --git a/canaille/templates/forgotten-password.html b/canaille/templates/forgotten-password.html
index 436f2bfb..d2abfaca 100644
--- a/canaille/templates/forgotten-password.html
+++ b/canaille/templates/forgotten-password.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="loginform">
@@ -13,8 +12,6 @@
         </div>
     </h3>
 
-    {{ flask.messages() }}
-
     <div class="ui attached message">
         {% trans %}
         After this form is sent, if the email address or the login you provided
diff --git a/canaille/templates/group.html b/canaille/templates/group.html
index 20602c42..a5973597 100644
--- a/canaille/templates/group.html
+++ b/canaille/templates/group.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block script %}
     <script src="/static/js/confirm.js"></script>
@@ -58,8 +57,6 @@
         </div>
     </h2>
 
-    {{ flask.messages() }}
-
     <form method="POST"
     id="{{ form.__class__.__name__|lower }}"
     action="{{ request.url }}"
diff --git a/canaille/templates/groups.html b/canaille/templates/groups.html
index 1eff5f5f..94d87286 100644
--- a/canaille/templates/groups.html
+++ b/canaille/templates/groups.html
@@ -1,9 +1,6 @@
 {% extends 'base.html' %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
-{{ flask.messages() }}
-
 <div class="ui segment">
     <a class="ui primary button" href="{{ url_for('groups.create_group') }}">{% trans %}Add a group{% endtrans %}</a>
 </div>
diff --git a/canaille/templates/login.html b/canaille/templates/login.html
index 6fec377d..f3ad64c3 100644
--- a/canaille/templates/login.html
+++ b/canaille/templates/login.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="ui clearing segment">
@@ -19,8 +18,6 @@
         <div class="sub header">{% trans %}Log-in and manage your authorizations.{% endtrans %}</div>
     </h2>
 
-    {{ flask.messages() }}
-
     <form method="POST"
       id="{{ form.id or form.__class__.__name__|lower }}"
       action="{{ request.url }}"
diff --git a/canaille/templates/password.html b/canaille/templates/password.html
index 411d508d..b6348756 100644
--- a/canaille/templates/password.html
+++ b/canaille/templates/password.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="ui clearing segment">
@@ -19,8 +18,6 @@
         <div class="sub header">{% trans %}Please enter your password for this account.{% endtrans %}</div>
     </h2>
 
-    {{ flask.messages() }}
-
     <form method="POST"
       id="{{ form.id or form.__class__.__name__|lower }}"
       action="{{ request.url }}"
diff --git a/canaille/templates/profile.html b/canaille/templates/profile.html
index 0dbfcf3e..fa383c1b 100644
--- a/canaille/templates/profile.html
+++ b/canaille/templates/profile.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block script %}
     <script src="/static/js/confirm.js"></script>
@@ -52,8 +51,6 @@
         </div>
     </h2>
 
-    {{ flask.messages() }}
-
     <form method="POST"
       id="{{ form.__class__.__name__|lower }}"
       action="{{ request.url }}"
diff --git a/canaille/templates/reset-password.html b/canaille/templates/reset-password.html
index f34b3c62..f7625706 100644
--- a/canaille/templates/reset-password.html
+++ b/canaille/templates/reset-password.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% import 'fomanticui.j2' as sui %}
-{% import 'flask.j2' as flask %}
 
 {% block content %}
 <div class="loginform">
@@ -13,8 +12,6 @@
         </div>
     </h3>
 
-    {{ flask.messages() }}
-
     <div class="ui attached clearing segment">
         {{ sui.render_form(form, _("Password reset"), action=url_for("account.reset", uid=uid, hash=hash)) }}
     </div>
diff --git a/canaille/templates/users.html b/canaille/templates/users.html
index 432d332a..3adb6888 100644
--- a/canaille/templates/users.html
+++ b/canaille/templates/users.html
@@ -1,5 +1,4 @@
 {% extends 'base.html' %}
-{% import 'flask.j2' as flask %}
 
 {% block style %}
     <link href="/static/datatables/jquery.dataTables.min.css" rel="stylesheet">
@@ -13,8 +12,6 @@
 {% endblock %}
 
 {% block content %}
-{{ flask.messages() }}
-
 <div class="ui segment">
     <a class="ui primary button" href="{{ url_for('account.profile_creation') }}">{% trans %}Add a user{% endtrans %}</a>
 </div>