yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into group-list-button

Browse Source
This commit is contained in:
Hugh Rundle
2022-01-03 10:28:59 +11:00
parent ea08b302c9 0734e5cb62
commit d4acd89a28
20 changed files with 907 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bookwyrm/views/shelf/shelf.py
View File

@ -72,9 +72,13 @@ class Shelf(View):
"start_date"
)
if shelf_identifier:
books = books.annotate(shelved_date=F("shelfbook__shelved_date"))
else:
# sorting by shelved date will cause duplicates in the "all books" view
books = books.annotate(shelved_date=F("updated_date"))
books = books.annotate(
rating=Subquery(reviews.values("rating")[:1]),
shelved_date=F("shelfbook__shelved_date"),
start_date=Subquery(reading.values("start_date")[:1]),
finish_date=Subquery(reading.values("finish_date")[:1]),
author=Subquery(