diff --git a/awx/api/serializers.py b/awx/api/serializers.py index dff11b2786..4c1b64602d 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -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