Merge pull request #4028 from jangsutsr/3976_update_workflow_job_foreign_key_related_name

Update workflow job foreign key related_name.

awx/main/access.py

@@ -1579,7 +1579,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})

awx/main/migrations/0034_v310_add_workflows.py

@@ -79,7 +79,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='workflowjob',
             name='workflow_job_template',
-            field=models.ForeignKey(related_name='jobs', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to='main.WorkflowJobTemplate', null=True),
+            field=models.ForeignKey(related_name='workflow_jobs', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to='main.WorkflowJobTemplate', null=True),
         ),
         migrations.AddField(
             model_name='activitystream',

awx/main/models/workflow.py

@@ -426,7 +426,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,

awx/main/tests/functional/test_rbac_workflow.py

@@ -28,7 +28,7 @@ def wfjt_node(wfjt_with_nodes):
 
 @pytest.fixture
 def workflow_job(wfjt):
-    return wfjt.jobs.create(name='test_workflow')
+    return wfjt.workflow_jobs.create(name='test_workflow')
 
 
 @pytest.mark.django_db