diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-19 22:29:40 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-24 19:27:29 +0100 |
| commit | 4deda94a380dc4217247b49df6e8a5bce0082ddc (patch) | |
| tree | f973aac31b5f57b176b29617e7041bfb1e12198a | |
| parent | 4305580e8538e5523e9f621c3ffbed14a2ddc350 (diff) | |
| download | mediagoblin-4deda94a380dc4217247b49df6e8a5bce0082ddc.tar.lz mediagoblin-4deda94a380dc4217247b49df6e8a5bce0082ddc.tar.xz mediagoblin-4deda94a380dc4217247b49df6e8a5bce0082ddc.zip | |
Replace media.get_uploader()._id by media.uploader
media.get_uploader()._id loads a complete user object
without actually needing it, because media.uploader already
has the id!
| -rw-r--r-- | mediagoblin/decorators.py | 6 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 229664d7..4cf14a70 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -57,10 +57,10 @@ def user_may_delete_media(controller): Require user ownership of the MediaEntry to delete. """ def wrapper(request, *args, **kwargs): - uploader = request.db.MediaEntry.find_one( - {'_id': ObjectId(request.matchdict['media'])}).get_uploader() + uploader_id = request.db.MediaEntry.find_one( + {'_id': ObjectId(request.matchdict['media'])}).uploader if not (request.user.is_admin or - request.user._id == uploader._id): + request.user._id == uploader_id): return exc.HTTPForbidden() return controller(request, *args, **kwargs) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 87b82c74..449e3b1c 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -192,7 +192,7 @@ def media_confirm_delete(request, media): location=media.url_for_self(request.urlgen)) if ((request.user.is_admin and - request.user._id != media.get_uploader()._id)): + request.user._id != media.uploader)): messages.add_message( request, messages.WARNING, _("You are about to delete another user's media. " |