External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed duplicate entries in active_roles (again)

Browse Source 
#1692
This commit is contained in:
Akita Noek
2016-05-16 10:49:34 -04:00
parent 4919eff769
commit ac5bc2aaba
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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