zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Uses filters, fixes for any shelf

Browse source
This commit is contained in:
Ross Chapman 2023-12-05 19:33:59 -08:00
parent b27ed847d5
commit 979162da10
6 changed files with 21 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,8 +43,6 @@ 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(
@ -56,11 +54,6 @@ class Shelf(View):
shelfbook__shelf__in=shelves
).distinct()
# 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")
if is_api_request(request) and shelf_identifier:
@ -83,8 +76,6 @@ 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]),
@ -99,6 +90,9 @@ class Shelf(View):
books = sort_books(books, request.GET.get("sort"))
if shelves_search_query:
books = search(shelves_search_query, books=books)
paginated = Paginator(
books,
PAGE_LENGTH,
@ -116,7 +110,6 @@ class Shelf(View):
"page_range": paginated.get_elided_page_range(
page.number, on_each_side=2, on_ends=1
),
"has_shelves_query": bool(shelves_search_query),
"shelves_search_query": shelves_search_query
}