heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo changes since gsoc in media_confirm_delete

Browse Source 
Since the Gsoc the use of decorators has simplified this function.
Reintroduce the same code as before Adidits blog branch made these
changes.
This commit is contained in:
Sebastian Spaeth 2013-12-12 17:38:18 +01:00
parent 52a0387fc6
commit 686cbcd974
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mediagoblin/user_pages/views.py
View File

@ -286,28 +286,10 @@ def media_collect(request, media):
#TODO: Why does @user_may_delete_media not implicate @require_active_login? #TODO: Why does @user_may_delete_media not implicate @require_active_login?
@get_media_entry_by_id
@require_active_login @require_active_login
def media_confirm_delete(request): @user_may_delete_media
def media_confirm_delete(request, media):
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)
uploader_id = media.uploader
if not (request.user.has_privilege(u'admin') or
request.user.id == uploader_id):
raise Forbidden()
form = user_forms.ConfirmDeleteForm(request.form) form = user_forms.ConfirmDeleteForm(request.form)