# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-07-12 20:56:21
# Node ID 81441341421ab4487d70d7ddcd451a2cb4c1d388
# Parent  d622a0b92eff4408f022c1e6b88016e6b23ba0f5

pyramid: changes for pyramid migration.

diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -106,17 +106,22 @@ class BaseAppView(object):
     def _get_local_tmpl_context(self, include_app_defaults=False):
         c = TemplateArgs()
         c.auth_user = self.request.user
+        # TODO(marcink): migrate the usage of c.rhodecode_user to c.auth_user
+        c.rhodecode_user = self.request.user
+
         if include_app_defaults:
             # NOTE(marcink): after full pyramid migration include_app_defaults
             # should be turned on by default
             from rhodecode.lib.base import attach_context_attributes
             attach_context_attributes(c, self.request, self.request.user.user_id)
+
         return c
 
     def _register_global_c(self, tmpl_args):
         """
         Registers attributes to pylons global `c`
         """
+
         # TODO(marcink): remove once pyramid migration is finished
         from pylons import tmpl_context as c
         for k, v in tmpl_args.items():
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -253,7 +253,7 @@ def error_handler(exception, request):
     c.causes = []
     if hasattr(base_response, 'causes'):
         c.causes = base_response.causes
-    c.messages = helpers.flash.pop_messages()
+    c.messages = helpers.flash.pop_messages(request=request)
 
     response = render_to_response(
         '/errors/error_document.mako', {'c': c, 'h': helpers}, request=request,