rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Merge pull request #1261 from bookwyrm-social/list-display

Browse source 
Improves cross-edition display for lists
This commit is contained in:
Mouse Reeve 2021-08-07 07:54:42 -06:00 committed by GitHub
commit d7a79573c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/templatetags/bookwyrm_tags.py
View file

@ -12,7 +12,7 @@ register = template.Library()
def get_rating(book, user): def get_rating(book, user):
"""get the overall rating of a book""" """get the overall rating of a book"""
queryset = views.helpers.privacy_filter( queryset = views.helpers.privacy_filter(
user, models.Review.objects.filter(book=book) user, models.Review.objects.filter(book__in=book.parent_work.editions.all())
) )
return queryset.aggregate(Avg("rating"))["rating__avg"] return queryset.aggregate(Avg("rating"))["rating__avg"]

11
bookwyrm/views/books.py
View file

@ -65,6 +65,13 @@ class Book(View):
queryset = queryset.select_related("user") queryset = queryset.select_related("user")
paginated = Paginator(queryset, PAGE_LENGTH) paginated = Paginator(queryset, PAGE_LENGTH)
lists = privacy_filter(
request.user,
models.List.objects.filter(
listitem__approved=True,
listitem__book__in=book.parent_work.editions.all(),
),
)
data = { data = {
"book": book, "book": book,
"statuses": paginated.get_page(request.GET.get("page")), "statuses": paginated.get_page(request.GET.get("page")),
@ -75,9 +82,7 @@ class Book(View):
if not user_statuses if not user_statuses
else None, else None,
"rating": reviews.aggregate(Avg("rating"))["rating__avg"], "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
"lists": privacy_filter( "lists": lists,
request.user, book.list_set.filter(listitem__approved=True)
),
} }
if request.user.is_authenticated: if request.user.is_authenticated: