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

Test fixes and a couple of view optimizations

Browse Source
This commit is contained in:
Akita Noek
2016-04-16 18:30:06 -04:00
parent 5d0c6cc044
commit 850e4c3ace
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

@@ -667,7 +667,7 @@ class OrganizationDetail(RetrieveUpdateDestroyAPIView):
org_id = int(self.kwargs['pk']) org_id = int(self.kwargs['pk'])
org_counts = {} org_counts = {}
access_kwargs = {'accessor': self.request.user, 'role_name': 'read_role'} access_kwargs = {'accessor': self.request.user, 'role_field': 'read_role'}
direct_counts = Organization.objects.filter(id=org_id).annotate( direct_counts = Organization.objects.filter(id=org_id).annotate(
users=Count('member_role__members', distinct=True), users=Count('member_role__members', distinct=True),
admins=Count('admin_role__members', distinct=True) admins=Count('admin_role__members', distinct=True)
@@ -784,8 +784,8 @@ class TeamList(ListCreateAPIView):
serializer_class = TeamSerializer serializer_class = TeamSerializer
def get_queryset(self): def get_queryset(self):
qs = Team.accessible_objects(self.request.user, 'read_role') qs = Team.accessible_objects(self.request.user, 'read_role').order_by()
qs = qs.select_related('admin_role', 'auditor_role', 'member_role') qs = qs.select_related('admin_role', 'auditor_role', 'member_role', 'organization')
return qs return qs
class TeamDetail(RetrieveUpdateDestroyAPIView): class TeamDetail(RetrieveUpdateDestroyAPIView):
@@ -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).distinct() team_creds = Credential.objects.filter(owner_role__parents=team.member_role)
return team_creds & visible_creds return team_creds & visible_creds
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):