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

Merge remote branch 'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll_and_gallery'

Browse Source 
Conflicts:
	mediagoblin/db/models.py
This commit is contained in:
Christopher Allan Webber 2011-07-06 22:47:33 -05:00
commit b27ec16786
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/db/models.py
View File

@ -150,8 +150,7 @@ class MediaEntry(Document):
cursor = self.db.MediaEntry.find({'_id' : {"$lt": self['_id']}, cursor = self.db.MediaEntry.find({'_id' : {"$lt": self['_id']},
'uploader': self['uploader'], 'uploader': self['uploader'],
'state': 'processed'}).sort( 'state': 'processed'}).sort(
'_id', DESCENDING).limit(1) '_id', ASCENDING).limit(1)
if cursor.count(): if cursor.count():
return urlgen('mediagoblin.user_pages.media_home', return urlgen('mediagoblin.user_pages.media_home',
user=self.uploader()['username'], user=self.uploader()['username'],
@ -164,7 +163,7 @@ class MediaEntry(Document):
cursor = self.db.MediaEntry.find({'_id' : {"$gt": self['_id']}, cursor = self.db.MediaEntry.find({'_id' : {"$gt": self['_id']},
'uploader': self['uploader'], 'uploader': self['uploader'],
'state': 'processed'}).sort( 'state': 'processed'}).sort(
'_id', ASCENDING).limit(1) '_id', DESCENDING).limit(1)
if cursor.count(): if cursor.count():
return urlgen('mediagoblin.user_pages.media_home', return urlgen('mediagoblin.user_pages.media_home',
@ -174,6 +173,7 @@ class MediaEntry(Document):
def uploader(self): def uploader(self):
return self.db.User.find_one({'_id': self['uploader']}) return self.db.User.find_one({'_id': self['uploader']})
class MediaComment(Document): class MediaComment(Document):
__collection__ = 'media_comments' __collection__ = 'media_comments'