diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-11-21 21:51:30 +0100 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-11-21 21:51:30 +0100 |
| commit | b9e1fa280edfff4daf424bbcf51bd651ed00f411 (patch) | |
| tree | 9f373c6443874bc5542115a79860da5957a1e182 /mediagoblin/user_pages/views.py | |
| parent | e56e5f8c5c3dc7909aa68a1543ed04ddb18e27f6 (diff) | |
| parent | c875bb74a8245b39b6985f37cb8ab838c22efa7e (diff) | |
| download | mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.lz mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.tar.xz mediagoblin-b9e1fa280edfff4daf424bbcf51bd651ed00f411.zip | |
Merge branch 'video_gstreamer-only'
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/submit/views.py
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -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 25fd2ebb..097696b8 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, |