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

pyramid: changes for pyramid migration.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-07-12 22:56:21 +02:00
parent 4a9be66cd1
commit b74413678d
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rhodecode/apps/_base/__init__.py
View file

@ -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():

2
rhodecode/config/middleware.py
View file

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