From 8708d71f4bd76454f8358902f0d024126ec4618d Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 2 Oct 2021 18:31:56 +1000 Subject: [PATCH] group members can see lists - fix visible_to_user for group objects (like lists) - temporarily disable privacy_filter on group lists --- bookwyrm/models/base_model.py | 4 ++-- bookwyrm/views/group.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 1b4bae1a..50119cc1 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -84,8 +84,8 @@ class BookWyrmModel(models.Model): # you can see objects which have a group of which you are a member if hasattr(self, "group"): if ( - hasattr(self.group, "members") - and viewer in self.group.members.all() + hasattr(self.group, "memberships") + and self.group.memberships.filter(user=viewer).exists() ): return True diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py index 37381165..718aa9ee 100644 --- a/bookwyrm/views/group.py +++ b/bookwyrm/views/group.py @@ -26,7 +26,7 @@ class Group(View): group = get_object_or_404(models.Group, id=group_id) lists = models.List.objects.filter(group=group).order_by("-updated_date") - lists = privacy_filter(request.user, lists) + # lists = privacy_filter(request.user, lists) # don't show groups to users who shouldn't see them if not group.visible_to_user(request.user):