From ca4f2eb005a488c4132f9960bbcd81d7d8f970e8 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 26 Sep 2016 16:53:46 -0400 Subject: [PATCH] fix bug where not all char_prompts were coppied to workflow job --- awx/main/models/workflow.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index b27f7cd36b..cc89046815 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -278,18 +278,18 @@ class WorkflowJobInheritNodesMixin(object): unified_job_template=old_node.unified_job_template, ) ujt_obj = old_node.unified_job_template - if ujt_obj: + if ujt_obj and hasattr(ujt_obj, '_ask_for_vars_dict'): ask_for_vars_dict = ujt_obj._ask_for_vars_dict() if ask_for_vars_dict['inventory'] and old_node.inventory: kwargs['inventory'] = old_node.inventory if ask_for_vars_dict['credential'] and old_node.credential: kwargs['credential'] = old_node.credential + new_char_prompts = {} for fd in CHAR_PROMPTS_LIST: - new_char_prompts = {} if ask_for_vars_dict[fd] and old_node.char_prompts.get(fd, None): new_char_prompts[fd] = old_node.char_prompts[fd] - if new_char_prompts: - kwargs['char_prompts'] = new_char_prompts + if new_char_prompts: + kwargs['char_prompts'] = new_char_prompts new_node_list.append(WorkflowJobNode.objects.create(**kwargs)) return new_node_list