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

avoid re-building fields for cancel and relaunch endpoints

Browse Source
This commit is contained in:
AlanCoding
2017-05-11 17:11:57 -04:00
parent 44c1935590
commit 244ebecd16
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -2160,7 +2160,7 @@ class JobOptionsSerializer(LabelsListMixin, BaseSerializer):
fields = super(JobOptionsSerializer, self).get_fields() fields = super(JobOptionsSerializer, self).get_fields()
# TODO: remove when API v1 is removed # 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()) fields.update(V1JobOptionsSerializer().get_fields())
return fields return fields
@@ -2202,7 +2202,7 @@ class JobOptionsSerializer(LabelsListMixin, BaseSerializer):
ret['credential'] = None ret['credential'] = None
if 'vault_credential' in ret and not obj.vault_credential: if 'vault_credential' in ret and not obj.vault_credential:
ret['vault_credential'] = None 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['cloud_credential'] = obj.cloud_credential
ret['network_credential'] = obj.network_credential ret['network_credential'] = obj.network_credential
return ret return ret