External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 20:51:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6249 from AlanCoding/job_action_serializer

Browse Source 
Avoid re-building fields for cancel and relaunch endpoints
This commit is contained in:
Alan Rominger 2017-05-12 09:37:25 -04:00 committed by GitHub
commit f7f27e94d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@ -2164,7 +2164,7 @@ class JobOptionsSerializer(LabelsListMixin, BaseSerializer):
fields = super(JobOptionsSerializer, self).get_fields()
# TODO: remove when API v1 is removed
if self.version == 1:
if self.version == 1 and 'credential' in self.Meta.fields:
fields.update(V1JobOptionsSerializer().get_fields())
return fields
@ -2206,7 +2206,7 @@ class JobOptionsSerializer(LabelsListMixin, BaseSerializer):
ret['credential'] = None
if 'vault_credential' in ret and not obj.vault_credential:
ret['vault_credential'] = None
if self.version == 1:
if self.version == 1 and 'credential' in self.Meta.fields:
ret['cloud_credential'] = obj.cloud_credential
ret['network_credential'] = obj.network_credential
return ret