diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2014-06-20 08:03:29 +0400 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2016-07-25 04:13:04 +0300 |
| commit | dbb86ffbbf25651330266435752a6a0422cfb6e5 (patch) | |
| tree | 51b821f1b4d2e3035a8034d8d765b41253662409 /mediagoblin/db | |
| parent | 4fcd2e756dc3b1a318d0462084e991cca37d59fe (diff) | |
| download | mediagoblin-dbb86ffbbf25651330266435752a6a0422cfb6e5.tar.lz mediagoblin-dbb86ffbbf25651330266435752a6a0422cfb6e5.tar.xz mediagoblin-dbb86ffbbf25651330266435752a6a0422cfb6e5.zip | |
fixed bug #728
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/models.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 5393f679..b28e298a 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -1134,11 +1134,11 @@ class Collection(Base, CollectionMixin, CommentingMixin): def get_collection_items(self, ascending=False): #TODO, is this still needed with self.collection_items being available? - order_col = CollectionItem.position + order_col = MediaEntry.created if not ascending: order_col = desc(order_col) - return CollectionItem.query.filter_by( - collection=self.id).order_by(order_col) + return CollectionItem.query.join(MediaEntry).filter( + CollectionItem.collection==self.id).order_by(order_col) def __repr__(self): safe_title = self.title.encode('ascii', 'replace') |