mirror of
https://github.com/ansible/awx.git
synced 2026-03-11 06:29:31 -02:30
Update workflow job foreign key related_name.
This commit is contained in:
@@ -1555,7 +1555,7 @@ class WorkflowJobTemplateAccess(BaseAccess):
|
|||||||
if not is_delete_allowed:
|
if not is_delete_allowed:
|
||||||
return False
|
return False
|
||||||
active_jobs = [dict(type="workflow_job", id=o.id)
|
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:
|
if len(active_jobs) > 0:
|
||||||
raise StateConflict({"conflict": _("Resource is being used by running jobs"),
|
raise StateConflict({"conflict": _("Resource is being used by running jobs"),
|
||||||
"active_jobs": active_jobs})
|
"active_jobs": active_jobs})
|
||||||
|
|||||||
@@ -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),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -422,7 +422,7 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
|
|||||||
|
|
||||||
workflow_job_template = models.ForeignKey(
|
workflow_job_template = models.ForeignKey(
|
||||||
'WorkflowJobTemplate',
|
'WorkflowJobTemplate',
|
||||||
related_name='jobs',
|
related_name='workflow_jobs',
|
||||||
blank=True,
|
blank=True,
|
||||||
null=True,
|
null=True,
|
||||||
default=None,
|
default=None,
|
||||||
|
|||||||
Reference in New Issue
Block a user