Merge remote branch 'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll...

Conflicts:
	mediagoblin/db/models.py

diff --cc mediagoblin/db/models.py
index 37839a00d09f84487161de5083a1fc29b7a03cc3,e764d3680bc38b8ca34eb6bd82dc24ee4a9107bb..2b7933a4db324b60e1aa6cfddc54d3fa234dcdf9
--- 1/mediagoblin/db/models.py
--- 2/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@@ -147,11 -147,10 +147,10 @@@ class MediaEntry(Document)
          """
          Provide a url to the previous entry from this user, if there is one
          """
 -        cursor = self.db.MediaEntry.find({'_id' : {"$gt": self['_id']}, 
 -                                          'uploader': self['uploader']}).sort(
 +        cursor = self.db.MediaEntry.find({'_id' : {"$lt": self['_id']}, 
 +                                          'uploader': self['uploader'],
 +                                          'state': 'processed'}).sort(
-                                                     '_id', DESCENDING).limit(1)
-                                                     
+                                                     '_id', ASCENDING).limit(1)
 -                                                    
          if cursor.count():
              return urlgen('mediagoblin.user_pages.media_home',
                            user=self.uploader()['username'],
@@@ -161,10 -160,9 +160,10 @@@
          """
          Provide a url to the next entry from this user, if there is one
          """
 -        cursor = self.db.MediaEntry.find({'_id' : {"$lt": self['_id']}, 
 -                                          'uploader': self['uploader']}).sort(
 +        cursor = self.db.MediaEntry.find({'_id' : {"$gt": self['_id']}, 
 +                                          'uploader': self['uploader'],
 +                                          'state': 'processed'}).sort(
-                                                     '_id', ASCENDING).limit(1)
+                                                     '_id', DESCENDING).limit(1)
  
          if cursor.count():
              return urlgen('mediagoblin.user_pages.media_home',
@@@ -174,6 -172,6 +173,7 @@@
      def uploader(self):
          return self.db.User.find_one({'_id': self['uploader']})
  
++
  class MediaComment(Document):
      __collection__ = 'media_comments'