mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-18 06:06:34 +00:00
Code Issues Projects Releases Wiki Activity

Add order for shelf books to satisfy warning

Browse source 
I believe this will sort books by order they were added to the shelf,
which seems reasonable. Should add some tests to make sure though.
This commit is contained in:
Joel Bradshaw 2021-01-13 23:44:44 -08:00
parent 8986af42d6
commit b0ea31f2a9
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/models/base_model.py
View file

@ -281,4 +281,6 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
def to_activity(self, **kwargs): def to_activity(self, **kwargs):
''' an ordered collection of the specified model queryset ''' ''' an ordered collection of the specified model queryset '''
if not self.collection_queryset.ordered:
raise RuntimeError('collection_queryset must be ordered')
return self.to_ordered_collection(self.collection_queryset, **kwargs) return self.to_ordered_collection(self.collection_queryset, **kwargs)

3
bookwyrm/models/shelf.py
View file

@ -39,7 +39,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
@property @property
def collection_queryset(self): def collection_queryset(self):
''' list of books for this shelf, overrides OrderedCollectionMixin ''' ''' list of books for this shelf, overrides OrderedCollectionMixin '''
return self.books.all() return self.books.all().order_by('shelfbook')
def get_remote_id(self): def get_remote_id(self):
''' shelf identifier instead of id ''' ''' shelf identifier instead of id '''
@ -90,3 +90,4 @@ class ShelfBook(ActivitypubMixin, BookWyrmModel):
''' an opinionated constraint! ''' an opinionated constraint!
you can't put a book on shelf twice ''' you can't put a book on shelf twice '''
unique_together = ('book', 'shelf') unique_together = ('book', 'shelf')
ordering = ('-created_date',)