heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename MediaEntry.uploader() to .get_uploader()

Browse Source 
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()
This commit is contained in:
Elrond
2011-11-21 21:40:48 +01:00
parent 4d4e5b435b
commit 3018832153
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/db/models.py
View File

@@ -263,7 +263,7 @@ class MediaEntry(Document):
Use a slug if we have one, else use our '_id'.
"""
uploader = self.uploader()
uploader = self.get_uploader()
if self.get('slug'):
return urlgen(
@@ -286,7 +286,7 @@ class MediaEntry(Document):
'_id', ASCENDING).limit(1)
if cursor.count():
return urlgen('mediagoblin.user_pages.media_home',
user=self.uploader()['username'],
user=self.get_uploader()['username'],
media=unicode(cursor[0]['slug']))
def url_to_next(self, urlgen):
@@ -300,10 +300,10 @@ class MediaEntry(Document):
if cursor.count():
return urlgen('mediagoblin.user_pages.media_home',
user=self.uploader()['username'],
user=self.get_uploader()['username'],
media=unicode(cursor[0]['slug']))
def uploader(self):
def get_uploader(self):
return self.db.User.find_one({'_id': self['uploader']})
def get_fail_exception(self):