From eca516f8ce0722698b01762b600cc85332613c36 Mon Sep 17 00:00:00 2001 From: Rebeccah Date: Wed, 5 Feb 2020 16:21:20 -0500 Subject: [PATCH] removed 'self' from positional arguemnt of workflow attribute 'all_parents_must_converge' per Alans suggestion, since django takes it to be verbose_name, which is not needed --- .../migrations/0107_v370_workflow_convergence_api_toggle.py | 4 ++-- awx/main/models/workflow.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/awx/main/migrations/0107_v370_workflow_convergence_api_toggle.py b/awx/main/migrations/0107_v370_workflow_convergence_api_toggle.py index de7bf60004..ec22305f03 100644 --- a/awx/main/migrations/0107_v370_workflow_convergence_api_toggle.py +++ b/awx/main/migrations/0107_v370_workflow_convergence_api_toggle.py @@ -13,11 +13,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='workflowjobnode', name='all_parents_must_converge', - field=models.BooleanField(default=False, help_text='If enabled then the node will only run if all of the parent nodes have met the criteria to reach this node', verbose_name='self'), + field=models.BooleanField(default=False, help_text='If enabled then the node will only run if all of the parent nodes have met the criteria to reach this node'), ), migrations.AddField( model_name='workflowjobtemplatenode', name='all_parents_must_converge', - field=models.BooleanField(default=False, help_text='If enabled then the node will only run if all of the parent nodes have met the criteria to reach this node', verbose_name='self'), + field=models.BooleanField(default=False, help_text='If enabled then the node will only run if all of the parent nodes have met the criteria to reach this node'), ), ] diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index a41fc92311..4e648bbfb0 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -80,7 +80,6 @@ class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig): related_name='%(class)ss_always', ) all_parents_must_converge = models.BooleanField( - 'self', default=False, help_text=_("If enabled then the node will only run if all of the parent nodes " "have met the criteria to reach this node")