From 06430741abbe1edda33f90911d809f17f8dd5243 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Wed, 10 May 2023 11:37:59 -0400 Subject: [PATCH] Fix 400 error from job labels sublist (#13972) This was caused by an incorrect parent_key ref from label to job also applies to workflow_job labels This fixes a regression introduced by a recent merge (#13957) --- awx/api/views/__init__.py | 1 - awx/main/tests/functional/api/test_job.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index b48ff17345..5fdc0e29d7 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -3333,7 +3333,6 @@ class JobLabelList(SubListAPIView): serializer_class = serializers.LabelSerializer parent_model = models.Job relationship = 'labels' - parent_key = 'job' class WorkflowJobLabelList(JobLabelList): diff --git a/awx/main/tests/functional/api/test_job.py b/awx/main/tests/functional/api/test_job.py index 53e31e5981..836f94da0c 100644 --- a/awx/main/tests/functional/api/test_job.py +++ b/awx/main/tests/functional/api/test_job.py @@ -51,6 +51,16 @@ def test_job_relaunch_permission_denied_response(post, get, inventory, project, r = post(reverse('api:job_relaunch', kwargs={'pk': job.pk}), {}, jt_user, expect=201) +@pytest.mark.django_db +def test_label_sublist(get, admin_user, organization): + job = Job.objects.create() + label = Label.objects.create(organization=organization, name='Steve') + job.labels.add(label) + r = get(url=reverse('api:job_label_list', kwargs={'pk': job.pk}), user=admin_user, expect=200) + assert r.data['count'] == 1 + assert r.data['results'].pop()['id'] == label.id + + @pytest.mark.django_db def test_job_relaunch_prompts_not_accepted_response(post, get, inventory, project, credential, net_credential, machine_credential): jt = JobTemplate.objects.create(name='testjt', inventory=inventory, project=project)