aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/app.py4
-rw-r--r--mediagoblin/tools/template.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index dc2900a9..3ebaa45b 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -201,9 +201,9 @@ class MediaGoblinApp(object):
exc.get_description(environ))(environ, start_response)
controller = endpoint_to_controller(found_rule)
- # Make a reference to the controller on the request...
+ # Make a reference to the controller's symbolic name on the request...
# used for lazy context modification
- request.controller = controller
+ request.controller_name = found_rule.endpoint
# pass the request through our meddleware classes
try:
diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py
index 84fdabf2..950fb5da 100644
--- a/mediagoblin/tools/template.py
+++ b/mediagoblin/tools/template.py
@@ -107,7 +107,7 @@ def render_template(request, template_path, context):
# allow plugins to do things to the context
context = hook_transform(
- (request.controller, template_path),
+ (request.controller_name, template_path),
context)
rendered = template.render(context)