External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 12:40:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix prompts contradiction: should be non-functional change

Browse Source
This commit is contained in:
AlanCoding
2018-11-15 13:43:23 -05:00
committed by Jake McDermott
parent 018a8e12de
commit bca9bcf6dd
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -4458,9 +4458,7 @@ class WorkflowJobLaunchSerializer(BaseSerializer):
def validate(self, attrs): def validate(self, attrs):
template = self.instance template = self.instance
accepted, rejected, errors = template._accept_or_ignore_job_kwargs( accepted, rejected, errors = template._accept_or_ignore_job_kwargs(**attrs)
_exclude_errors=['required'],
**attrs)
self._ignored_fields = rejected self._ignored_fields = rejected
if template.inventory and template.inventory.pending_deletion is True: if template.inventory and template.inventory.pending_deletion is True:

2
awx/main/models/workflow.py
View File

@@ -420,7 +420,7 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
workflow_job.copy_nodes_from_original(original=self) workflow_job.copy_nodes_from_original(original=self)
return workflow_job 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', []) exclude_errors = kwargs.pop('_exclude_errors', [])
prompted_data = {} prompted_data = {}
rejected_data = {} rejected_data = {}