External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

move fix into get_job_kwargs

Browse Source
This commit is contained in:
Peter Braun
2026-03-30 12:45:20 +02:00
parent 0a80c91a96
commit 4f231aea44
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,7 +335,9 @@ class WorkflowJobNode(WorkflowNodeBase):
# or labels, because they do not propogate WFJT-->node at all # or labels, because they do not propogate WFJT-->node at all
# Combine WFJT prompts with node here, WFJT at higher level # Combine WFJT prompts with node here, WFJT at higher level
node_prompts_data.update(wj_prompts_data) # Empty string values on the workflow job (e.g. from IaC setting limit: "")
# should not override a node's explicit non-empty prompt value
node_prompts_data.update({k: v for k, v in wj_prompts_data.items() if v != ''})
accepted_fields, ignored_fields, errors = ujt_obj._accept_or_ignore_job_kwargs(**node_prompts_data) accepted_fields, ignored_fields, errors = ujt_obj._accept_or_ignore_job_kwargs(**node_prompts_data)
if errors: if errors:
logger.info( logger.info(

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

@@ -476,7 +476,7 @@ class NullablePromptPseudoField:
return instance.char_prompts.get(self.field_name, None) return instance.char_prompts.get(self.field_name, None)
def __set__(self, instance, value): def __set__(self, instance, value):
if value in (None, {}, ''): if value in (None, {}):
instance.char_prompts.pop(self.field_name, None) instance.char_prompts.pop(self.field_name, None)
else: else:
instance.char_prompts[self.field_name] = value instance.char_prompts[self.field_name] = value