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

Merge pull request #5143 from AlanCoding/getinline

Browse Source 
Apply username ordering to more views

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-10-29 20:42:49 +00:00
committed by GitHub
parent c69db02762 cf168b27d2
commit 2ccf0a0004
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views/__init__.py
View File

@@ -575,6 +575,7 @@ class TeamUsersList(BaseUsersList):
serializer_class = serializers.UserSerializer serializer_class = serializers.UserSerializer
parent_model = models.Team parent_model = models.Team
relationship = 'member_role.members' relationship = 'member_role.members'
ordering = ('username',)
class TeamRolesList(SubListAttachDetachAPIView): class TeamRolesList(SubListAttachDetachAPIView):
@@ -911,6 +912,7 @@ class UserList(ListCreateAPIView):
model = models.User model = models.User
serializer_class = serializers.UserSerializer serializer_class = serializers.UserSerializer
permission_classes = (UserPermission,) permission_classes = (UserPermission,)
ordering = ('username',)
class UserMeList(ListAPIView): class UserMeList(ListAPIView):
@@ -918,6 +920,7 @@ class UserMeList(ListAPIView):
model = models.User model = models.User
serializer_class = serializers.UserSerializer serializer_class = serializers.UserSerializer
name = _('Me') name = _('Me')
ordering = ('username',)
def get_queryset(self): def get_queryset(self):
return self.model.objects.filter(pk=self.request.user.pk) return self.model.objects.filter(pk=self.request.user.pk)
@@ -1261,6 +1264,7 @@ class CredentialOwnerUsersList(SubListAPIView):
serializer_class = serializers.UserSerializer serializer_class = serializers.UserSerializer
parent_model = models.Credential parent_model = models.Credential
relationship = 'admin_role.members' relationship = 'admin_role.members'
ordering = ('username',)
class CredentialOwnerTeamsList(SubListAPIView): class CredentialOwnerTeamsList(SubListAPIView):