aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-09-10 17:42:50 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-09-10 17:42:50 -0500
commit55376ff403496a3271154627c45fe59dc2b44ca7 (patch)
tree971f150b1c836c0213e8880b6b69d2f37e20039d /mediagoblin/user_pages
parent0125e5567bfa71e47d79fa02acbe7f66c0c8bec7 (diff)
parent8d7b549bb6d17c66ce1d3590da6e9bd0868b4403 (diff)
downloadmediagoblin-55376ff403496a3271154627c45fe59dc2b44ca7.tar.lz
mediagoblin-55376ff403496a3271154627c45fe59dc2b44ca7.tar.xz
mediagoblin-55376ff403496a3271154627c45fe59dc2b44ca7.zip
Merge remote branch 'remotes/elrond/idea/use_media_url_for_self'
Diffstat (limited to 'mediagoblin/user_pages')
-rw-r--r--mediagoblin/user_pages/views.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index f60bd186..6a82d718 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -165,9 +165,8 @@ def media_confirm_delete(request, media):
return redirect(request, "mediagoblin.user_pages.user_home",
user=username)
else:
- return redirect(request, "mediagoblin.user_pages.media_home",
- user=media.uploader()['username'],
- media=media['slug'])
+ return exc.HTTPFound(
+ location=media.url_for_self(request.urlgen))
if ((request.user[u'is_admin'] and
request.user[u'_id'] != media.uploader()[u'_id'])):