External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 21:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1925 from anoek/1692

Browse Source 
Fixed duplicate entries in active_roles (again)
This commit is contained in:
Akita Noek
2016-05-16 11:23:58 -04:00
parent b9d654690a 06eb13a104
commit 2435de6261
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/generics.py
View File

@@ -508,4 +508,4 @@ class ResourceAccessList(ListAPIView):
ancestors = set() ancestors = set()
for r in roles: for r in roles:
ancestors.update(set(r.ancestors.all())) ancestors.update(set(r.ancestors.all()))
return User.objects.filter(roles__in=list(ancestors)) return User.objects.filter(roles__in=list(ancestors)).distinct()

8
awx/api/serializers.py
View File

@@ -1573,12 +1573,12 @@ class ResourceAccessListElementSerializer(UserSerializer):
.exclude(id__in=indirect_team_roles) .exclude(id__in=indirect_team_roles)
ret['summary_fields']['direct_access'] \ ret['summary_fields']['direct_access'] \
= [format_role_perm(r) for r in direct_access_roles] \ = [format_role_perm(r) for r in direct_access_roles.distinct()] \
+ [format_team_role_perm(r, direct_permissive_role_ids) for r in direct_team_roles] + [format_team_role_perm(r, direct_permissive_role_ids) for r in direct_team_roles.distinct()]
ret['summary_fields']['indirect_access'] \ ret['summary_fields']['indirect_access'] \
= [format_role_perm(r) for r in indirect_access_roles] \ = [format_role_perm(r) for r in indirect_access_roles.distinct()] \
+ [format_team_role_perm(r, all_permissive_role_ids) for r in indirect_team_roles] + [format_team_role_perm(r, all_permissive_role_ids) for r in indirect_team_roles.distinct()]
return ret return ret