From bca9bcf6ddc3cd7f0b87f5856079c8c2a8527fa1 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 15 Nov 2018 13:43:23 -0500 Subject: [PATCH] fix prompts contradiction: should be non-functional change --- awx/api/serializers.py | 4 +--- awx/main/models/workflow.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 236549a2fa..eba6bbcf4e 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4458,9 +4458,7 @@ class WorkflowJobLaunchSerializer(BaseSerializer): def validate(self, attrs): template = self.instance - accepted, rejected, errors = template._accept_or_ignore_job_kwargs( - _exclude_errors=['required'], - **attrs) + accepted, rejected, errors = template._accept_or_ignore_job_kwargs(**attrs) self._ignored_fields = rejected if template.inventory and template.inventory.pending_deletion is True: diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 4d6cad4b4e..1ede7d1b31 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -420,7 +420,7 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl workflow_job.copy_nodes_from_original(original=self) return workflow_job - def _accept_or_ignore_job_kwargs(self, _exclude_errors=(), **kwargs): + def _accept_or_ignore_job_kwargs(self, **kwargs): exclude_errors = kwargs.pop('_exclude_errors', []) prompted_data = {} rejected_data = {}