diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-24 15:24:58 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-24 15:24:58 -0600 |
| commit | 99d2ac1d83962fb4dc38f01d63d2ad4036226765 (patch) | |
| tree | 5c8a3a8c6f7ee5ea3662a6c791855864c5784e1a /mediagoblin/user_pages | |
| parent | 30188321531e1b0d3c78166498702bbd8c7dc2bc (diff) | |
| parent | 6506b1e22c70b55a73ee4cb391aebaf73db79ef9 (diff) | |
| download | mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.lz mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.tar.xz mediagoblin-99d2ac1d83962fb4dc38f01d63d2ad4036226765.zip | |
Merge remote-tracking branch 'remotes/jwandborg/master'
Diffstat (limited to 'mediagoblin/user_pages')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 61cae775..3d9735f7 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -30,6 +30,8 @@ from mediagoblin.decorators import (uses_pagination, get_user_media_entry, from werkzeug.contrib.atom import AtomFeed +from mediagoblin.media_types import get_media_manager + @uses_pagination def user_home(request, page): @@ -120,9 +122,11 @@ def media_home(request, media, page, **kwargs): comment_form = user_forms.MediaCommentForm(request.POST) + media_template_name = get_media_manager(media['media_type'])['display_template'] + return render_to_response( request, - 'mediagoblin/user_pages/media.html', + media_template_name, {'media': media, 'comments': comments, 'pagination': pagination, |