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

Merge pull request #77 from ryanpetrello/fix-6116

Browse Source 
filter credential_type__search from related search fields in API v1
This commit is contained in:
Ryan Petrello
2017-07-27 15:16:17 -04:00
committed by GitHub
parent 36f49467c6 cb85038976
commit dd16966e09
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/api/views.py
View File

@@ -1615,7 +1615,18 @@ class CredentialTypeActivityStreamList(ActivityStreamEnforcementMixin, SubListAP
new_in_api_v2 = True new_in_api_v2 = True
class CredentialList(ListCreateAPIView): # remove in 3.3
class CredentialViewMixin(object):
@property
def related_search_fields(self):
ret = super(CredentialViewMixin, self).related_search_fields
if get_request_version(self.request) == 1 and 'credential_type__search' in ret:
ret.remove('credential_type__search')
return ret
class CredentialList(CredentialViewMixin, ListCreateAPIView):
model = Credential model = Credential
serializer_class = CredentialSerializerCreate serializer_class = CredentialSerializerCreate
@@ -1650,7 +1661,7 @@ class CredentialOwnerTeamsList(SubListAPIView):
return self.model.objects.filter(pk__in=teams) return self.model.objects.filter(pk__in=teams)
class UserCredentialsList(SubListCreateAPIView): class UserCredentialsList(CredentialViewMixin, SubListCreateAPIView):
model = Credential model = Credential
serializer_class = UserCredentialSerializerCreate serializer_class = UserCredentialSerializerCreate
@@ -1667,7 +1678,7 @@ class UserCredentialsList(SubListCreateAPIView):
return user_creds & visible_creds return user_creds & visible_creds
class TeamCredentialsList(SubListCreateAPIView): class TeamCredentialsList(CredentialViewMixin, SubListCreateAPIView):
model = Credential model = Credential
serializer_class = TeamCredentialSerializerCreate serializer_class = TeamCredentialSerializerCreate
@@ -1684,7 +1695,7 @@ class TeamCredentialsList(SubListCreateAPIView):
return (team_creds & visible_creds).distinct() return (team_creds & visible_creds).distinct()
class OrganizationCredentialList(SubListCreateAPIView): class OrganizationCredentialList(CredentialViewMixin, SubListCreateAPIView):
model = Credential model = Credential
serializer_class = OrganizationCredentialSerializerCreate serializer_class = OrganizationCredentialSerializerCreate