diff --git a/awx/main/access.py b/awx/main/access.py index 20d5ae508f..70c094e256 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -1555,7 +1555,7 @@ class WorkflowJobTemplateAccess(BaseAccess): if not is_delete_allowed: return False active_jobs = [dict(type="workflow_job", id=o.id) - for o in obj.jobs.filter(status__in=ACTIVE_STATES)] + for o in obj.workflow_jobs.filter(status__in=ACTIVE_STATES)] if len(active_jobs) > 0: raise StateConflict({"conflict": _("Resource is being used by running jobs"), "active_jobs": active_jobs}) diff --git a/awx/main/migrations/0051_v310_workflow_job_related_name_modification.py b/awx/main/migrations/0051_v310_workflow_job_related_name_modification.py new file mode 100644 index 0000000000..077961b174 --- /dev/null +++ b/awx/main/migrations/0051_v310_workflow_job_related_name_modification.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0050_v310_JSONField_changes'), + ] + + operations = [ + migrations.AlterField( + model_name='workflowjob', + name='workflow_job_template', + field=models.ForeignKey(related_name='workflow_jobs', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to='main.WorkflowJobTemplate', null=True), + ), + ] diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 4e2b6e3b90..3bdaaf4d5a 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -422,7 +422,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,