taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix membership timeline entries in the user profile

remotes/origin/enhancement/email-actions
Jesús Espino 2015-08-08 14:50:36 +02:00
parent 2681c7dcd5
commit a744146af9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
taiga/timeline/service.py
View File

@ -122,7 +122,9 @@ def filter_timeline_for_user(timeline, user):
# There is no specific permission for seeing new memberships
membership_content_type = ContentType.objects.get(app_label="projects", model="membership")
tl_filter |= Q(project__is_private=True, data_content_type=membership_content_type)
tl_filter |= Q(project__is_private=True,
project__anon_permissions__contains=["view_project"],
data_content_type=membership_content_type)
# Filtering private projects where user is member
if not user.is_anonymous():
@ -132,6 +134,7 @@ def filter_timeline_for_user(timeline, user):
for content_type_key, content_type in content_types.items():
if content_type_key in membership.role.permissions or membership.is_owner:
tl_filter |= Q(project=membership.project, data_content_type=content_type)
tl_filter |= Q(project=membership.project, data_content_type=membership_content_type)
timeline = timeline.filter(tl_filter)
return timeline