heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'

Browse Source
This commit is contained in:
Christopher Allan Webber
2013-01-16 11:06:22 -06:00
parent 4f8f0353b1 461dd9717c
commit 27aebe05a6
8 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/edit/views.py
View File

@@ -27,6 +27,7 @@ from mediagoblin.auth import lib as auth_lib
from mediagoblin.edit import forms
from mediagoblin.edit.lib import may_edit_media
from mediagoblin.decorators import (require_active_login, active_user_from_url,
get_media_entry_by_id,
get_user_media_entry, user_may_alter_collection, get_user_collection)
from mediagoblin.tools.response import render_to_response, redirect
from mediagoblin.tools.translate import pass_to_ugettext as _
@@ -37,7 +38,7 @@ from mediagoblin.db.util import check_media_slug_used, check_collection_slug_use
import mimetypes
@get_user_media_entry
@get_media_entry_by_id
@require_active_login
def edit_media(request, media):
if not may_edit_media(request, media):