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

fix regression of callback relaunch

Browse Source
This commit is contained in:
AlanCoding
2018-07-10 08:45:23 -04:00
parent 9c653cb603
commit ec643d6406
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/access.py
View File

@@ -1504,7 +1504,7 @@ class JobAccess(BaseAccess):
if obj.job_template is not None: if obj.job_template is not None:
if config is None: if config is None:
prompts_access = False prompts_access = False
elif config.prompts_dict() == {}: elif not config.has_user_prompts(obj.job_template):
prompts_access = True prompts_access = True
elif obj.created_by_id != self.user.pk: elif obj.created_by_id != self.user.pk:
prompts_access = False prompts_access = False

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

@@ -963,11 +963,22 @@ class JobLaunchConfig(LaunchTimeConfig):
editable=False, editable=False,
) )
def has_user_prompts(self, template):
'''
Returns True if any fields exist in the launch config that are
not permissions exclusions
(has to exist because of callback relaunch exception)
'''
return self._has_user_prompts(template, only_unprompted=False)
def has_unprompted(self, template): def has_unprompted(self, template):
''' '''
returns False if the template has set ask_ fields to False after returns True if the template has set ask_ fields to False after
launching with those prompts launching with those prompts
''' '''
return self._has_user_prompts(template, only_unprompted=True)
def _has_user_prompts(self, template, only_unprompted=True):
prompts = self.prompts_dict() prompts = self.prompts_dict()
ask_mapping = template.get_ask_mapping() ask_mapping = template.get_ask_mapping()
if template.survey_enabled and (not template.ask_variables_on_launch): if template.survey_enabled and (not template.ask_variables_on_launch):
@@ -977,10 +988,10 @@ class JobLaunchConfig(LaunchTimeConfig):
element.get('variable') for element in element.get('variable') for element in
template.survey_spec.get('spec', {}) if 'variable' in element template.survey_spec.get('spec', {}) if 'variable' in element
) )
if provided_vars - survey_vars: if (provided_vars and not only_unprompted) or (provided_vars - survey_vars):
return True return True
for field_name, ask_field_name in ask_mapping.items(): for field_name, ask_field_name in ask_mapping.items():
if field_name in prompts and not getattr(template, ask_field_name): if field_name in prompts and not (getattr(template, ask_field_name) and only_unprompted):
if field_name == 'limit' and self.job and self.job.launch_type == 'callback': if field_name == 'limit' and self.job and self.job.launch_type == 'callback':
continue # exception for relaunching callbacks continue # exception for relaunching callbacks
return True return True