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

Ensure workflow_job_template being set during node creation.

Browse Source
This commit is contained in:
Aaron Tan
2016-10-26 15:52:49 -04:00
parent 237587c2e7
commit 7c9e1c91db
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -2322,6 +2322,8 @@ class WorkflowJobTemplateNodeSerializer(WorkflowNodeBaseSerializer):
raise serializers.ValidationError({ raise serializers.ValidationError({
"job_type": "%s is not a valid job type. The choices are %s." % ( "job_type": "%s is not a valid job type. The choices are %s." % (
attrs['char_prompts']['job_type'], job_types)}) attrs['char_prompts']['job_type'], job_types)})
if self.instance is None and 'workflow_job_template' not in attrs:
raise serializers.ValidationError({"workflow_job_template": "Workflow job template is missing during creation"})
ujt_obj = attrs.get('unified_job_template', None) ujt_obj = attrs.get('unified_job_template', None)
if isinstance(ujt_obj, (WorkflowJobTemplate, SystemJobTemplate)): if isinstance(ujt_obj, (WorkflowJobTemplate, SystemJobTemplate)):
raise serializers.ValidationError({ raise serializers.ValidationError({

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

@@ -140,7 +140,6 @@ class WorkflowNodeBase(CreatedModifiedModel):
'inventory', 'credential', 'char_prompts'] 'inventory', 'credential', 'char_prompts']
class WorkflowJobTemplateNode(WorkflowNodeBase): class WorkflowJobTemplateNode(WorkflowNodeBase):
# TODO: Ensure the API forces workflow_job_template being set
workflow_job_template = models.ForeignKey( workflow_job_template = models.ForeignKey(
'WorkflowJobTemplate', 'WorkflowJobTemplate',
related_name='workflow_job_template_nodes', related_name='workflow_job_template_nodes',
@@ -149,7 +148,7 @@ class WorkflowJobTemplateNode(WorkflowNodeBase):
default=None, default=None,
on_delete=models.CASCADE, on_delete=models.CASCADE,
) )
def get_absolute_url(self): def get_absolute_url(self):
return reverse('api:workflow_job_template_node_detail', args=(self.pk,)) return reverse('api:workflow_job_template_node_detail', args=(self.pk,))