Merge branch 'main' of github.com:bookwyrm-social/bookwyrm

This commit is contained in:
Willi Hohenstein 2022-02-04 14:09:15 +01:00
commit a3e2cd77a1

View file

@ -33,9 +33,13 @@ class User(View):
# only show shelves that should be visible # only show shelves that should be visible
is_self = request.user.id == user.id is_self = request.user.id == user.id
if not is_self: if not is_self:
shelves = models.Shelf.privacy_filter( shelves = (
models.Shelf.privacy_filter(
request.user, privacy_levels=["public", "followers"] request.user, privacy_levels=["public", "followers"]
).filter(user=user, books__isnull=False) )
.filter(user=user, books__isnull=False)
.distinct()
)
else: else:
shelves = user.shelf_set.filter(books__isnull=False).distinct() shelves = user.shelf_set.filter(books__isnull=False).distinct()