diff options
| author | Nathan Yergler <nathan@yergler.net> | 2011-10-01 12:08:58 -0700 |
|---|---|---|
| committer | Nathan Yergler <nathan@yergler.net> | 2011-10-01 12:08:58 -0700 |
| commit | 6bfbe0242653678c09258b7a642514d706153eac (patch) | |
| tree | d3e0c7f94f566886a6b80ce98d8a003465f4368f /mediagoblin/user_pages/views.py | |
| parent | 0a8a3fc1571100aba3bd3a3dec98f5e9e252780b (diff) | |
| parent | 573aba86b58c2ab064d0d57ed0bbae6bdf9a2819 (diff) | |
| download | mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.lz mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.xz mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.zip | |
Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 2c376283..6a82d718 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -154,7 +154,7 @@ def media_confirm_delete(request, media): form = user_forms.ConfirmDeleteForm(request.POST) if request.method == 'POST' and form.validate(): - if request.POST.get('confirm') == 'True': + if form.confirm.data is True: username = media.uploader()['username'] # Delete all files on the public storage @@ -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'])): |