Skip to content

Commit

Permalink
Merge branch 'jinja' of http://github.com/stefans/buildbot into jinja
Browse files Browse the repository at this point in the history
  • Loading branch information
marcus-sonestedt committed Nov 8, 2009
2 parents e337fdd + 5717340 commit ec6cf85
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions buildbot/status/web/waterfall.py
Expand Up @@ -266,7 +266,7 @@ def content(self, request, context):
cxt['times'] = times
cxt['current_reload_time'] = current_reload_time

template = request.templates.get_template("waterfallhelp.html")
template = request.site.buildbot_service.templates.get_template("waterfallhelp.html")
return template.render(**cxt)


Expand Down Expand Up @@ -404,7 +404,7 @@ def with_args(req, remove_args=[], new_args=[], new_path=None):
if self.get_reload_time(request) is not None:
cxt['no_reload_page'] = with_args(request, remove_args=["reload"])

template = request.templates.get_template("waterfall.html")
template = request.site.buildbot_service.templates.get_template("waterfall.html")
data = template.render(**cxt)
data += self.footer(request)
return data
Expand Down

0 comments on commit ec6cf85

Please sign in to comment.