Fix view file name in ticket traceback, fix #1740, fix #1676

This commit is contained in:
ilvalle
2017-08-19 10:07:52 +02:00
parent 5e6c3dba81
commit 9694c66703
2 changed files with 10 additions and 5 deletions
+6 -3
View File
@@ -676,6 +676,7 @@ def run_view_in(environment):
badv = 'invalid view (%s)' % view
patterns = response.get('generic_patterns')
layer = None
scode = None
if patterns:
regex = re_compile('|'.join(map(fnmatch.translate, patterns)))
short_action = '%(controller)s/%(function)s.%(extension)s' % request
@@ -718,12 +719,14 @@ def run_view_in(environment):
# if the view is not compiled
if not layer:
# Compile the template
ccode = parse_template(view,
# Parse template
scode = parse_template(view,
pjoin(folder, 'views'),
context=environment)
# Compile template
ccode = compile2(scode, filename)
layer = filename
restricted(ccode, environment, layer=layer)
restricted(ccode, environment, layer=layer, scode=scode)
# parse_template saves everything in response body
return environment['response'].body.getvalue()