From 82b3aebb678fe1ea091167cd622d10d832a595b2 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 13 Jul 2017 11:56:28 +0200
Subject: [PATCH] pyramid: make alerts always use request.session instead of
 pylons one.

---
 rhodecode/lib/helpers.py           | 4 ++--
 rhodecode/templates/base/root.mako | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index cb2579b9..e829950e 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -690,9 +690,9 @@ class Flash(_Flash):
         session.save()
         return messages
 
-    def json_alerts(self):
+    def json_alerts(self, request=None):
         payloads = []
-        messages = flash.pop_messages()
+        messages = flash.pop_messages(request=request)
         if messages:
             for message in messages:
                 subdata = {}
diff --git a/rhodecode/templates/base/root.mako b/rhodecode/templates/base/root.mako
index fe9145db..5707e19b 100644
--- a/rhodecode/templates/base/root.mako
+++ b/rhodecode/templates/base/root.mako
@@ -113,7 +113,7 @@ c.template_context['default_user'] = {
             <script language="javascript" type="text/javascript" src="${h.asset('js/excanvas.min.js')}"></script>
             <![endif]-->
             <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
-            <script> var alertMessagePayloads = ${h.flash.json_alerts()|n}; </script>
+            <script> var alertMessagePayloads = ${h.flash.json_alerts(request)|n}; </script>
             ## avoide escaping the %N
             <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
             <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>