diff --git a/taiga/projects/notifications/services.py b/taiga/projects/notifications/services.py index 2e1d6d55..b6c0fbdd 100644 --- a/taiga/projects/notifications/services.py +++ b/taiga/projects/notifications/services.py @@ -323,26 +323,24 @@ def get_related_people(obj): :return: User queryset object representing the users related to the object. """ - related_people_q = Q() + + ## - Watchers + related_people_ids = list(get_watchers(obj).values_list('id', flat=True)) ## - Owner if hasattr(obj, "owner_id") and obj.owner_id: - related_people_q.add(Q(id=obj.owner_id), Q.OR) + related_people_ids.append(obj.owner_id) ## - Assigned to if hasattr(obj, "assigned_to_id") and obj.assigned_to_id: - related_people_q.add(Q(id=obj.assigned_to_id), Q.OR) - - ## - Watchers - related_people_q.add(_get_q_watchers(obj), Q.OR) + related_people_ids.append(obj.assigned_to_id) ## - Apply filters - related_people = get_user_model().objects.filter(related_people_q) + related_people = get_user_model().objects.filter(id__in=set(related_people_ids)) ## - Exclude inactive and system users and remove duplicate related_people = related_people.exclude(is_active=False) related_people = related_people.exclude(is_system=True) - related_people = related_people.distinct() return related_people