diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-19 13:54:49 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-19 13:54:49 -0600 |
| commit | 5db324f7c60506cfb8124dc72ac8f408c341c0a0 (patch) | |
| tree | 2a63f8f7d176be15a4b7af7cb1660240f203d975 | |
| parent | b4b7b6a57a5ad9a5e52a5d3e05f9ad3d3e8b650a (diff) | |
| parent | 1a3138addd43d410b03cdd1816e0a62bd217de30 (diff) | |
| download | mediagoblin-5db324f7c60506cfb8124dc72ac8f408c341c0a0.tar.lz mediagoblin-5db324f7c60506cfb8124dc72ac8f408c341c0a0.tar.xz mediagoblin-5db324f7c60506cfb8124dc72ac8f408c341c0a0.zip | |
Merge remote branch 'remotes/inconexo/441_comment_order'
| -rw-r--r-- | mediagoblin/db/models.py | 9 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 1c1bc2fd..f13a4457 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -217,9 +217,14 @@ class MediaEntry(Document): 'created': datetime.datetime.utcnow, 'state': u'unprocessed'} - def get_comments(self): + def get_comments(self, ascending=False): + if ascending: + order = ASCENDING + else: + order = DESCENDING + return self.db.MediaComment.find({ - 'media_entry': self._id}).sort('created', DESCENDING) + 'media_entry': self._id}).sort('created', order) def get_display_media(self, media_map, fetch_order=common.DISPLAY_IMAGE_FETCHING_ORDER): diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 82865bb4..98a21bb4 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -106,11 +106,11 @@ def media_home(request, media, page, **kwargs): """ if ObjectId(request.matchdict.get('comment')): pagination = Pagination( - page, media.get_comments(), MEDIA_COMMENTS_PER_PAGE, + page, media.get_comments(True), MEDIA_COMMENTS_PER_PAGE, ObjectId(request.matchdict.get('comment'))) else: pagination = Pagination( - page, media.get_comments(), MEDIA_COMMENTS_PER_PAGE) + page, media.get_comments(True), MEDIA_COMMENTS_PER_PAGE) comments = pagination() |