aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/user_pages/views.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-11-21 21:40:48 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-11-22 22:29:37 +0100
commit30188321531e1b0d3c78166498702bbd8c7dc2bc (patch)
tree2aaabcf0f3157a032e316066101f2db819ab09c8 /mediagoblin/user_pages/views.py
parent4d4e5b435b54fcf0920786a40e190c1748cc2ed1 (diff)
downloadmediagoblin-30188321531e1b0d3c78166498702bbd8c7dc2bc.tar.lz
mediagoblin-30188321531e1b0d3c78166498702bbd8c7dc2bc.tar.xz
mediagoblin-30188321531e1b0d3c78166498702bbd8c7dc2bc.zip
Rename MediaEntry.uploader() to .get_uploader()
The .uploader() method conflicts with the uploader database field. As we're moving to .FIELD for db field access, this is a relevant conflict. So renaming .uploader() to .get_uploader()
Diffstat (limited to 'mediagoblin/user_pages/views.py')
-rw-r--r--mediagoblin/user_pages/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index f679be9c..61cae775 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -169,7 +169,7 @@ def media_confirm_delete(request, media):
if request.method == 'POST' and form.validate():
if form.confirm.data is True:
- username = media.uploader()['username']
+ username = media.get_uploader()['username']
# Delete all files on the public storage
delete_media_files(media)
@@ -188,7 +188,7 @@ def media_confirm_delete(request, media):
location=media.url_for_self(request.urlgen))
if ((request.user[u'is_admin'] and
- request.user._id != media.uploader()._id)):
+ request.user._id != media.get_uploader()._id)):
messages.add_message(
request, messages.WARNING,
_("You are about to delete another user's media. "