engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pyramid: make alerts always use request.session instead of pylons one.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-07-13 11:56:28 +02:00
parent aa2f4917f2
commit 82b3aebb67
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rhodecode/lib/helpers.py
View file

@ -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 = {}

2
rhodecode/templates/base/root.mako
View file

@ -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>