Commit 0f237f6e7767022055c4fb33b66f123962a7622a
1 parent
a6449796
Exists in
master
and in
2 other branches
Removing duplicate users in mural get users
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
mural/utils.py
| @@ -8,15 +8,15 @@ def getSpaceUsers(user, post): | @@ -8,15 +8,15 @@ def getSpaceUsers(user, post): | ||
| 8 | elif post._my_subclass == "categorypost": | 8 | elif post._my_subclass == "categorypost": |
| 9 | space = post.get_space() | 9 | space = post.get_space() |
| 10 | 10 | ||
| 11 | - return User.objects.filter(Q(is_staff = True) | Q(coordinators__id = space) | Q(professors__category__id = space) | Q(subject_student__category__id = space)).exclude(id = user) | 11 | + return User.objects.filter(Q(is_staff = True) | Q(coordinators__id = space) | Q(professors__category__id = space) | Q(subject_student__category__id = space)).exclude(id = user).distinct() |
| 12 | elif post._my_subclass == "subjectpost": | 12 | elif post._my_subclass == "subjectpost": |
| 13 | space = post.get_space() | 13 | space = post.get_space() |
| 14 | 14 | ||
| 15 | if post.subjectpost.resource: | 15 | if post.subjectpost.resource: |
| 16 | resource = post.subjectpost.resource | 16 | resource = post.subjectpost.resource |
| 17 | 17 | ||
| 18 | - return User.objects.filter(Q(is_staff = True) | Q(professors__id = space) | Q(coordinators__subject_category__id = space) | Q(resource_students = resource) | Q(group_participants__resource_groups = resource) | (Q(subject_student__id = space) & Q(subject_student__topic_subject__resource_topic = resource) & Q(subject_student__topic_subject__resource_topic__all_students = True))).exclude(id = user) | 18 | + return User.objects.filter(Q(is_staff = True) | Q(professors__id = space) | Q(coordinators__subject_category__id = space) | Q(resource_students = resource) | Q(group_participants__resource_groups = resource) | (Q(subject_student__id = space) & Q(subject_student__topic_subject__resource_topic = resource) & Q(subject_student__topic_subject__resource_topic__all_students = True))).exclude(id = user).distinct() |
| 19 | else: | 19 | else: |
| 20 | - return User.objects.filter(Q(is_staff = True) | Q(professors__id = space) | Q(coordinators__subject_category__id = space) | Q(subject_student__id = space)).exclude(id = user) | 20 | + return User.objects.filter(Q(is_staff = True) | Q(professors__id = space) | Q(coordinators__subject_category__id = space) | Q(subject_student__id = space)).exclude(id = user).distinct() |
| 21 | 21 | ||
| 22 | return None | 22 | return None |
| 23 | \ No newline at end of file | 23 | \ No newline at end of file |