From 3801b4a4e9319a5d2e8606d7dc5ab05b8ee130e3 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 15 Nov 2016 15:17:45 -0500 Subject: [PATCH 1/3] Update workflow job foreign key related_name. --- awx/main/access.py | 2 +- ..._workflow_job_related_name_modification.py | 20 +++++++++++++++++++ awx/main/models/workflow.py | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 awx/main/migrations/0051_v310_workflow_job_related_name_modification.py 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, From 32fe6ea4fa2aa710d2627b6c19c0e25013b72a1d Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 15 Nov 2016 15:52:55 -0500 Subject: [PATCH 2/3] Test fixture update. --- awx/main/tests/functional/test_rbac_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/tests/functional/test_rbac_workflow.py b/awx/main/tests/functional/test_rbac_workflow.py index 663af2639a..822fdc0bcc 100644 --- a/awx/main/tests/functional/test_rbac_workflow.py +++ b/awx/main/tests/functional/test_rbac_workflow.py @@ -24,7 +24,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 From 8a55c90c2c431ec079e240c3004f357b3b7a53be Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Tue, 15 Nov 2016 17:19:09 -0500 Subject: [PATCH 3/3] Remove unnecessary migrations. --- .../migrations/0034_v310_add_workflows.py | 2 +- ..._workflow_job_related_name_modification.py | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 awx/main/migrations/0051_v310_workflow_job_related_name_modification.py diff --git a/awx/main/migrations/0034_v310_add_workflows.py b/awx/main/migrations/0034_v310_add_workflows.py index ceaf091cad..c80a4ecc88 100644 --- a/awx/main/migrations/0034_v310_add_workflows.py +++ b/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', 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 deleted file mode 100644 index 077961b174..0000000000 --- a/awx/main/migrations/0051_v310_workflow_job_related_name_modification.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- 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), - ), - ]