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

Updated the org users and org admins api list endpoints to use new member_role.members

Browse Source
This commit is contained in:
Akita Noek
2016-03-16 10:29:12 -04:00
parent 7ec3b3b8b5
commit 460a14705a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/generics.py
View File

@@ -299,7 +299,7 @@ class SubListAPIView(ListAPIView, ParentMixin):
parent = self.get_parent_object()
self.check_parent_access(parent)
qs = self.request.user.get_queryset(self.model).distinct()
sublist_qs = getattr(parent, self.relationship).distinct()
sublist_qs = getattrd(parent, self.relationship).distinct()
return qs & sublist_qs
class SubListCreateAPIView(SubListAPIView, ListCreateAPIView):

4
awx/api/views.py
View File

@@ -633,14 +633,14 @@ class OrganizationUsersList(SubListCreateAttachDetachAPIView):
model = User
serializer_class = UserSerializer
parent_model = Organization
relationship = 'users'
relationship = 'member_role.members'
class OrganizationAdminsList(SubListCreateAttachDetachAPIView):
model = User
serializer_class = UserSerializer
parent_model = Organization
relationship = 'admins'
relationship = 'admin_role.members'
class OrganizationProjectsList(SubListCreateAttachDetachAPIView):