diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-16 11:06:22 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-01-16 11:06:22 -0600 |
| commit | 27aebe05a64862d552646b2b1e6c59fbe39ae1d5 (patch) | |
| tree | d62accc6165941be634f66578c3e82e85d9e7d22 /mediagoblin/edit | |
| parent | 4f8f0353b191c71dfa876b12621c573f98e10d1d (diff) | |
| parent | 461dd9717cce6c5b4d40bb4e76ca65d9d898d1df (diff) | |
| download | mediagoblin-27aebe05a64862d552646b2b1e6c59fbe39ae1d5.tar.lz mediagoblin-27aebe05a64862d552646b2b1e6c59fbe39ae1d5.tar.xz mediagoblin-27aebe05a64862d552646b2b1e6c59fbe39ae1d5.zip | |
Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'
Diffstat (limited to 'mediagoblin/edit')
| -rw-r--r-- | mediagoblin/edit/views.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index ece11df5..9b7cab46 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -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): |