External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 22:49:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Bug fixes from integration ran on launchtime branch

Browse Source 
Make error message for muti-vault validation more
consistent with historical message
This commit is contained in:
AlanCoding
2017-12-07 13:37:28 -05:00
parent 72a8854c27
commit 1c8217936d
11 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,7 +230,7 @@ class WorkflowJobNode(WorkflowNodeBase):
if extra_vars:
data['extra_vars'] = extra_vars
# ensure that unified jobs created by WorkflowJobs are marked
data['launch_type'] = 'workflow'
data['_eager_fields'] = {'launch_type': 'workflow'}
return data
@@ -366,7 +366,7 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
# WFJTs do not behave like JTs, it can not accept inventory, credential, etc.
bad_kwargs = kwargs.copy()
bad_kwargs.pop('extra_vars')
bad_kwargs.pop('extra_vars', None)
if bad_kwargs:
rejected_fields.update(bad_kwargs)
for field in bad_kwargs: