External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-06 18:49:21 -02:30
Code Issues Packages Projects Releases Wiki Activity

fixes for api/test_credential.py

Browse Source
This commit is contained in:
Akita Noek
2016-04-15 16:29:22 -04:00
parent d5bc455677
commit 5e7b6ed084
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/views.py
View File

@@ -831,8 +831,8 @@ class TeamProjectsList(SubListAPIView):
def get_queryset(self): def get_queryset(self):
team = self.get_parent_object() team = self.get_parent_object()
self.check_parent_access(team) self.check_parent_access(team)
team_qs = Project.objects.filter(Q(member_role__parents=team.member_role) | Q(admin_role__parents=team.member_role)) team_qs = Project.objects.filter(Q(member_role__parents=team.member_role) | Q(admin_role__parents=team.member_role)).distinct()
user_qs = Project.accessible_objects(self.request.user, 'read_role') user_qs = Project.accessible_objects(self.request.user, 'read_role').distinct()
return team_qs & user_qs return team_qs & user_qs
@@ -1217,7 +1217,7 @@ class CredentialList(ListCreateAPIView):
organization = Organization.objects.get(pk=request.data['organization']) organization = Organization.objects.get(pk=request.data['organization'])
obj = organization obj = organization
if self.request.user not in obj.owner_role: if self.request.user not in obj.admin_role:
raise PermissionDenied() raise PermissionDenied()
ret = super(CredentialList, self).post(request, *args, **kwargs) ret = super(CredentialList, self).post(request, *args, **kwargs)
@@ -1263,7 +1263,7 @@ class TeamCredentialsList(CredentialList):
raise PermissionDenied() raise PermissionDenied()
visible_creds = Credential.accessible_objects(self.request.user, 'read_role') visible_creds = Credential.accessible_objects(self.request.user, 'read_role')
team_creds = Credential.objects.filter(owner_role__parents=team.member_role) team_creds = Credential.objects.filter(owner_role__parents=team.member_role).distinct()
return team_creds & visible_creds return team_creds & visible_creds
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):