From 958fecac7d8e8f8722f46bef130cc9b6842bee15 Mon Sep 17 00:00:00 2001
From: Dominik Turecek <dturecek@redhat.com>
Date: Apr 16 2018 11:28:28 +0000
Subject: [frontend] fix flash messages not disappearing after page reload


---

diff --git a/frontend/coprs_frontend/coprs/templates/layout.html b/frontend/coprs_frontend/coprs/templates/layout.html
index 672c806..0a818a5 100644
--- a/frontend/coprs_frontend/coprs/templates/layout.html
+++ b/frontend/coprs_frontend/coprs/templates/layout.html
@@ -79,11 +79,19 @@
     <div class="container">
 
       <!-- Flash messages -->
-      {% with messages = get_flashed_messages(with_categories=true) %}
-        {% for type, message in messages %}
+      {% if flashes %}
+        {% for type, message in flashes %}
           {{ alert(message, type) }}
         {% endfor %}
-      {% endwith %}
+      {% else %}
+        {% with messages = get_flashed_messages(with_categories=true) %}
+          {% for type, message in messages %}
+            {{ alert(message, type) }}
+          {% endfor %}
+        {% endwith %}
+      {% endif %}
+
+
 
       <!-- the actual content -->
       {% block body %}{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index 2990ae2..881121e 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -63,11 +63,17 @@ def copr_builds(copr):
 
 
 def render_copr_builds(copr):
+    flashes = flask.session.pop('_flashes', [])
     builds_query = builds_logic.BuildsLogic.get_copr_builds_list(copr=copr)
-    return flask.Response(stream_with_context(helpers.stream_template("coprs/detail/builds.html",
+    response = flask.Response(stream_with_context(helpers.stream_template("coprs/detail/builds.html",
                                  copr=copr,
-                                 builds=list(builds_query))))
+                                 builds=list(builds_query),
+                                 flashes=flashes,
+                                 )))
 
+    flask.session.pop('_flashes', [])
+    app.save_session(flask.session, response)
+    return response
 
 ################################ Url builds ################################
 
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py
index 2d777a3..b7c08a0 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py
@@ -3,6 +3,7 @@ import json
 
 from flask import Response, stream_with_context, url_for
 from flask import send_file
+from coprs import app
 from coprs import db
 from coprs import forms
 from coprs import helpers
@@ -20,10 +21,17 @@ from coprs.exceptions import (ActionInProgressException,ObjectNotFound, NoPackag
 @coprs_ns.route("/g/<group_name>/<coprname>/packages/")
 @req_with_copr
 def copr_packages(copr):
+    flashes = flask.session.pop('_flashes', [])
     packages_query = PackagesLogic.get_copr_packages_list(copr)
-    return flask.Response(stream_with_context(helpers.stream_template("coprs/detail/packages.html",
+    response = flask.Response(stream_with_context(helpers.stream_template("coprs/detail/packages.html",
                                  copr=copr,
-                                 packages=list(packages_query))))
+                                 packages=list(packages_query),
+                                 flashes=flashes,
+                                 )))
+
+    flask.session.pop('_flashes', [])
+    app.save_session(flask.session, response)
+    return response
 
 @coprs_ns.route("/<username>/<coprname>/package/<package_name>/")
 @coprs_ns.route("/g/<group_name>/<coprname>/package/<package_name>/")