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

Merge branch 'devel' into workflow-channels

Browse Source
This commit is contained in:
Wayne Witzel III
2016-11-17 16:22:52 -05:00
parent 9dda4d452f cf8f12c1f0
commit 62d0b9fc98
40 changed files with 942 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -428,7 +428,7 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
workflow_job_template = models.ForeignKey(
'WorkflowJobTemplate',
related_name='jobs',
related_name='workflow_jobs',
blank=True,
null=True,
default=None,