aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-08-09 15:05:20 +0530
committerAditi <aditi.iitr@gmail.com>2013-08-09 15:05:20 +0530
commit97ce2563ed4fd4fa68a5d1e3db802e0d41d48a29 (patch)
treed72dd89534363c6be57bdd3824418f668d80fe5b
parentdee425d26c103b6fa0fbec827b5e40c53559753d (diff)
downloadmediagoblin-97ce2563ed4fd4fa68a5d1e3db802e0d41d48a29.tar.lz
mediagoblin-97ce2563ed4fd4fa68a5d1e3db802e0d41d48a29.tar.xz
mediagoblin-97ce2563ed4fd4fa68a5d1e3db802e0d41d48a29.zip
Add delete error for failed type.
-rw-r--r--mediagoblin/user_pages/views.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index e5930826..bac433ea 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -275,12 +275,16 @@ def media_collect(request, media):
@require_active_login
def media_confirm_delete(request):
- allowed_state = [u'processed', u'failed']
+ allowed_state = [u'failed', u'processed']
+ media = None
for media_state in allowed_state:
media = request.db.MediaEntry.query.filter_by(id=request.matchdict['media_id'], state=media_state).first()
+ if media:
+ break
+
if not media:
return render_404(request)
-
+
given_username = request.matchdict.get('user')
if given_username and (given_username != media.get_uploader.username):
return render_404(request)