##// END OF EJS Templates
pyramid: make alerts always use request.session instead of pylons one.
marcink -
r1916:e3a56235 default
parent child Browse files
Show More
@@ -690,9 +690,9 b' class Flash(_Flash):'
690 session.save()
690 session.save()
691 return messages
691 return messages
692
692
693 def json_alerts(self):
693 def json_alerts(self, request=None):
694 payloads = []
694 payloads = []
695 messages = flash.pop_messages()
695 messages = flash.pop_messages(request=request)
696 if messages:
696 if messages:
697 for message in messages:
697 for message in messages:
698 subdata = {}
698 subdata = {}
@@ -113,7 +113,7 b" c.template_context['default_user'] = {"
113 <script language="javascript" type="text/javascript" src="${h.asset('js/excanvas.min.js')}"></script>
113 <script language="javascript" type="text/javascript" src="${h.asset('js/excanvas.min.js')}"></script>
114 <![endif]-->
114 <![endif]-->
115 <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
115 <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
116 <script> var alertMessagePayloads = ${h.flash.json_alerts()|n}; </script>
116 <script> var alertMessagePayloads = ${h.flash.json_alerts(request)|n}; </script>
117 ## avoide escaping the %N
117 ## avoide escaping the %N
118 <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
118 <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
119 <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
119 <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
General Comments 0
You need to be logged in to leave comments. Login now