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

Work on team credentials.

Browse Source
This commit is contained in:
Michael DeHaan
2013-04-04 15:50:56 -04:00
parent 541445d60f
commit c52f51162a
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/main/tests/projects.py
View File

@@ -322,9 +322,9 @@ class ProjectsTest(BaseTest):
# can list credentials on a team # can list credentials on a team
self.get(team_creds, expect=401) self.get(team_creds, expect=401)
self.get(team_creds, expect=401, auth=self.get_invalid_credentials()) self.get(team_creds, expect=401, auth=self.get_invalid_credentials())
self.get(team_creds, expect=201, auth=self.get_super_credentials()) self.get(team_creds, expect=200, auth=self.get_super_credentials())
self.get(team_creds, expect=201, auth=self.get_normal_credentials()) self.get(team_creds, expect=200, auth=self.get_normal_credentials())
self.get(team_creds, expect=201, auth=self.get_other_credentials()) self.get(team_creds, expect=403, auth=self.get_other_credentials())
self.get(team_creds, expect=403, auth=self.get_nobody_credentials()) self.get(team_creds, expect=403, auth=self.get_nobody_credentials())
# can edit a credential # can edit a credential

9
lib/main/views.py
View File

@@ -226,12 +226,13 @@ class TeamsCredentialsList(BaseSubList):
def _get_queryset(self): def _get_queryset(self):
team = Team.objects.get(pk=self.kwargs['pk']) team = Team.objects.get(pk=self.kwargs['pk'])
if not Team.can_user_read(self.request.user, team): if not Team.can_user_administrate(self.request.user, team):
raise PermissionDenied() if not (self.request.user.is_superuser or self.request.user in team.users.all()):
raise PermissionDenied()
project_credentials = Credential.objects.filter( project_credentials = Credential.objects.filter(
projects__team__users__in = [ user ] team = team
) )
return user.credentials.distinct() | project_credentials.distinct() return project_credentials.distinct()
class ProjectsList(BaseList): class ProjectsList(BaseList):