External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #811 from AlanCoding/i_wont_be_ignored

Browse Source 
Fix bug creating inventory source schedules
This commit is contained in:
Jake McDermott 2017-12-12 18:32:54 -05:00 committed by GitHub
commit 40d1f2671f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1558,10 +1558,10 @@ class SystemJobTemplate(UnifiedJobTemplate, SystemJobOptions):
success=list(success_notification_templates),
any=list(any_notification_templates))
def _accept_or_ignore_job_kwargs(self, **kwargs):
def _accept_or_ignore_job_kwargs(self, _exclude_errors=None, **kwargs):
extra_data = kwargs.pop('extra_vars', {})
prompted_data, rejected_data, errors = super(SystemJobTemplate, self)._accept_or_ignore_job_kwargs(**kwargs)
prompted_vars, rejected_vars, errors = self.accept_or_ignore_variables(extra_data, errors)
prompted_vars, rejected_vars, errors = self.accept_or_ignore_variables(extra_data, errors, _exclude_errors=_exclude_errors)
if prompted_vars:
prompted_data['extra_vars'] = prompted_vars
if rejected_vars:

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

@ -425,7 +425,7 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio
copy_m2m_relationships(self, unified_jt, fields)
return unified_jt
def _accept_or_ignore_job_kwargs(self, **kwargs):
def _accept_or_ignore_job_kwargs(self, _exclude_errors=None, **kwargs):
'''
Override in subclass if template accepts _any_ prompted params
'''