External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 23:16:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Handle can_start_without_user_input cornercase.

Browse Source
This commit is contained in:
Aaron Tan
2017-03-15 17:42:59 -04:00
parent 6680d88df0
commit 95e41e078c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,8 +310,10 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
elif self.variables_needed_to_start: elif self.variables_needed_to_start:
variables_needed = True variables_needed = True
prompting_needed = False prompting_needed = False
for value in self._ask_for_vars_dict().values(): for key, value in self._ask_for_vars_dict().iteritems():
if value: if value and not (key == 'extra_vars'
and callback_extra_vars is not None
and not variables_needed):
prompting_needed = True prompting_needed = True
return (not prompting_needed and return (not prompting_needed and
not self.passwords_needed_to_start and not self.passwords_needed_to_start and
@@ -1139,7 +1141,7 @@ class JobEvent(CreatedModifiedModel):
# Save artifact data to parent job (if provided). # Save artifact data to parent job (if provided).
if artifact_dict: if artifact_dict:
if event_data and isinstance(event_data, dict): if event_data and isinstance(event_data, dict):
# Note: Core has not added support for marking artifacts as # Note: Core has not added support for marking artifacts as
# sensitive yet. Going forward, core will not use # sensitive yet. Going forward, core will not use
# _ansible_no_log to denote sensitive set_stats calls. # _ansible_no_log to denote sensitive set_stats calls.
# Instead, they plan to add a flag outside of the traditional # Instead, they plan to add a flag outside of the traditional