zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Fixes result set passed to template

Browse source
This commit is contained in:
Ross Chapman 2023-12-05 16:36:58 -08:00
parent d93da4e86d
commit b27ed847d5
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bookwyrm/views/shelf/shelf.py
View file

@ -43,21 +43,23 @@ class Shelf(View):
shelf = get_object_or_404(user.shelf_set, identifier=shelf_identifier)
shelf.raise_visible_to_user(request.user)
books = shelf.books
if shelves_search_query:
books = search(shelves_search_query, books=books)
else:
# this is a constructed "all books" view, with a fake "shelf" obj
FakeShelf = namedtuple(
"Shelf", ("identifier", "name", "user", "books", "privacy")
)
if shelves_search_query:
logger.debug("AAAAAAAAAAAA")
all_books = models.Edition.viewer_aware_objects(request.user).filter(
books = models.Edition.viewer_aware_objects(request.user).filter(
# privacy is ensured because the shelves are already filtered above
shelfbook__shelf__in=shelves
).distinct()
books = search(shelves_search_query, books=all_books)
else:
logger.debug("BBBBBBBBB")
books = shelf.books
# TODO: [COMMENT]
if shelves_search_query:
books = search(shelves_search_query, books=books)
books = models.Edition.objects.filter(pk__in=books)
shelf = FakeShelf("all", _("All books"), user, books, "public")
@ -81,6 +83,8 @@ class Shelf(View):
"start_date"
)
# import pdb; pdb.set_trace()
books = books.annotate(shelved_date=Max("shelfbook__shelved_date"))
books = books.annotate(
rating=Subquery(reviews.values("rating")[:1]),