zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-29 19:31:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #81 from jangsutsr/6344_enforce_extra_vars_override_hierachy

Browse Source 
Enforce extra_vars override hierachy
This commit is contained in:
Aaron Tan
2017-07-27 09:21:25 -04:00
committed by GitHub
parent fde3e41042 047ad7ca4a
commit c3f2a8a140
5 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/utils/common.py
View File

@@ -424,7 +424,7 @@ def copy_model_by_class(obj1, Class2, fields, kwargs):
# Apply class-specific extra processing for origination of unified jobs
if hasattr(obj1, '_update_unified_job_kwargs') and obj1.__class__ != Class2:
new_kwargs = obj1._update_unified_job_kwargs(**create_kwargs)
new_kwargs = obj1._update_unified_job_kwargs(create_kwargs, kwargs)
else:
new_kwargs = create_kwargs