External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

fill in extra_vars to content box even if ask_for_vars false and survey enabled

Browse Source
This commit is contained in:
AlanCoding
2016-04-15 14:59:20 -04:00
parent d196024155
commit e0bd906de8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/views.py
View File

@@ -2082,18 +2082,19 @@ class JobTemplateLaunch(RetrieveAPIView, GenericAPIView):
def update_raw_data(self, data): def update_raw_data(self, data):
obj = self.get_object() obj = self.get_object()
extra_vars = data.get('extra_vars') or {} extra_vars = data.pop('extra_vars', None) or {}
if obj: if obj:
for p in obj.passwords_needed_to_start: for p in obj.passwords_needed_to_start:
data[p] = u'' data[p] = u''
for v in obj.variables_needed_to_start: for v in obj.variables_needed_to_start:
extra_vars.setdefault(v, u'') extra_vars.setdefault(v, u'')
if extra_vars:
data['extra_vars'] = extra_vars
ask_for_vars_dict = obj._ask_for_vars_dict() ask_for_vars_dict = obj._ask_for_vars_dict()
ask_for_vars_dict.pop('extra_vars')
for field in ask_for_vars_dict: for field in ask_for_vars_dict:
if not ask_for_vars_dict[field]: if not ask_for_vars_dict[field]:
data.pop(field, None) data.pop(field, None)
elif field == 'extra_vars':
data[field] = extra_vars
elif field == 'inventory' or field == 'credential': elif field == 'inventory' or field == 'credential':
data[field] = getattrd(obj, "%s.%s" % (field, 'id'), None) data[field] = getattrd(obj, "%s.%s" % (field, 'id'), None)
else: else: