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

Replace media.get_uploader()._id by media.uploader

Browse Source 
media.get_uploader()._id loads a complete user object
without actually needing it, because media.uploader already
has the id!
This commit is contained in:
Elrond 2011-12-19 22:29:40 +01:00
parent 4305580e85
commit 4deda94a38
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/decorators.py
View File

@ -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)

2
mediagoblin/user_pages/views.py
View File

@ -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. "