Merge pull request #4053 from chrismeyersfsu/fix-workflow_jobs_rename

Fix workflow jobs rename

awx/api/serializers.py

@@ -2208,7 +2208,7 @@ class WorkflowJobTemplateSerializer(LabelsListMixin, UnifiedJobTemplateSerialize
     def get_related(self, obj):
         res = super(WorkflowJobTemplateSerializer, self).get_related(obj)
         res.update(dict(
-            jobs = reverse('api:workflow_job_template_jobs_list', args=(obj.pk,)),
+            workflow_jobs = reverse('api:workflow_job_template_jobs_list', args=(obj.pk,)),
             schedules = reverse('api:workflow_job_template_schedules_list', args=(obj.pk,)),
             launch = reverse('api:workflow_job_template_launch', args=(obj.pk,)),
             workflow_nodes = reverse('api:workflow_job_template_workflow_nodes_list', args=(obj.pk,)),

awx/api/urls.py

@@ -260,7 +260,7 @@ system_job_urls = patterns('awx.api.views',
 workflow_job_template_urls = patterns('awx.api.views',
     url(r'^$',                                          'workflow_job_template_list'),
     url(r'^(?P<pk>[0-9]+)/$',                           'workflow_job_template_detail'),
-    url(r'^(?P<pk>[0-9]+)/jobs/$',                      'workflow_job_template_jobs_list'),
+    url(r'^(?P<pk>[0-9]+)/workflow_jobs/$',             'workflow_job_template_jobs_list'),
     url(r'^(?P<pk>[0-9]+)/launch/$',                    'workflow_job_template_launch'),
     url(r'^(?P<pk>[0-9]+)/schedules/$',                 'workflow_job_template_schedules_list'),
     url(r'^(?P<pk>[0-9]+)/survey_spec/$',               'workflow_job_template_survey_spec'),

awx/api/views.py

@@ -2984,7 +2984,7 @@ class WorkflowJobTemplateJobsList(SubListAPIView):
     model = WorkflowJob
     serializer_class = WorkflowJobListSerializer
     parent_model = WorkflowJobTemplate
-    relationship = 'jobs'
+    relationship = 'workflow_jobs'
     parent_key = 'workflow_job_template'
 
 

awx/main/tests/unit/api/serializers/test_workflow_serializers.py

@@ -26,7 +26,7 @@ class TestWorkflowJobTemplateSerializerGetRelated():
         return wfjt
 
     @pytest.mark.parametrize("related_resource_name", [
-        'jobs',
+        'workflow_jobs',
         'launch',
         'workflow_nodes',
     ])