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

Revert "fixed bug #728"

Browse Source 
This reverts commit dbb86ffbbf25651330266435752a6a0422cfb6e5.

It caused bug 5469
This commit is contained in:
Boris Bobrov 2016-08-16 03:45:20 +03:00
parent cacc679a24
commit 9d935dd838
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

@ -1162,11 +1162,11 @@ class Collection(Base, CollectionMixin, CommentingMixin):
def get_collection_items(self, ascending=False): def get_collection_items(self, ascending=False):
#TODO, is this still needed with self.collection_items being available? #TODO, is this still needed with self.collection_items being available?
order_col = MediaEntry.created order_col = CollectionItem.position
if not ascending: if not ascending:
order_col = desc(order_col) order_col = desc(order_col)
return CollectionItem.query.join(MediaEntry).filter( return CollectionItem.query.filter_by(
CollectionItem.collection==self.id).order_by(order_col) collection=self.id).order_by(order_col)
def __repr__(self): def __repr__(self):
safe_title = self.title.encode('ascii', 'replace') safe_title = self.title.encode('ascii', 'replace')