diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-04 23:14:08 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-04 23:14:08 -0600 |
| commit | 04b0b7a124130fe4db082c419e6f44a5a212ffab (patch) | |
| tree | 257c51b90aa86810efb839c0ad9af3bb3eb758c2 /mediagoblin/decorators.py | |
| parent | a085dda5d29a1353eaf7df3ddfc3a7c500af9186 (diff) | |
| parent | 707001950a42c7adfd6657f227a2c2dbbd09afce (diff) | |
| download | mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.tar.lz mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.tar.xz mediagoblin-04b0b7a124130fe4db082c419e6f44a5a212ffab.zip | |
Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
Conflicts:
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
Diffstat (limited to 'mediagoblin/decorators.py')
| -rw-r--r-- | mediagoblin/decorators.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 1cdce23a..56dddb44 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -58,7 +58,7 @@ def user_may_delete_media(controller): """ def wrapper(request, *args, **kwargs): uploader = request.db.MediaEntry.find_one( - {'_id': ObjectId(request.matchdict['media'])}).get_uploader() + {'slug': request.matchdict['media']}).get_uploader() if not (request.user['is_admin'] or request.user._id == uploader._id): return exc.HTTPForbidden() @@ -95,7 +95,6 @@ def get_user_media_entry(controller): if not user: return render_404(request) - media = request.db.MediaEntry.find_one( {'slug': request.matchdict['media'], 'state': 'processed', |