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

Uses max shelved date to get valid date for all books page

This commit is contained in:
Mouse Reeve 2022-01-20 14:28:30 -08:00
parent 28d675c5a0
commit afea857442
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
""" shelf views """ """ shelf views """
from collections import namedtuple from collections import namedtuple
from django.db.models import OuterRef, Subquery, F from django.db.models import OuterRef, Subquery, F, Max
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.http import HttpResponseBadRequest from django.http import HttpResponseBadRequest
@ -72,11 +72,7 @@ class Shelf(View):
"start_date" "start_date"
) )
if shelf_identifier: books = books.annotate(shelved_date=Max("shelfbook__shelved_date"))
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( books = books.annotate(
rating=Subquery(reviews.values("rating")[:1]), rating=Subquery(reviews.values("rating")[:1]),
start_date=Subquery(reading.values("start_date")[:1]), start_date=Subquery(reading.values("start_date")[:1]),