External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4053 from chrismeyersfsu/fix-workflow_jobs_rename

Browse Source 
Fix workflow jobs rename
This commit is contained in:
Chris Meyers
2016-11-17 11:18:43 -05:00
committed by GitHub
parent df5e3288c4 ef0df1fefd
commit cf71719635
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -2208,7 +2208,7 @@ class WorkflowJobTemplateSerializer(LabelsListMixin, UnifiedJobTemplateSerialize
def get_related(self, obj): def get_related(self, obj):
res = super(WorkflowJobTemplateSerializer, self).get_related(obj) res = super(WorkflowJobTemplateSerializer, self).get_related(obj)
res.update(dict( 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,)), schedules = reverse('api:workflow_job_template_schedules_list', args=(obj.pk,)),
launch = reverse('api:workflow_job_template_launch', 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,)), workflow_nodes = reverse('api:workflow_job_template_workflow_nodes_list', args=(obj.pk,)),

2
awx/api/urls.py
View File

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

2
awx/api/views.py
View File

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

2
awx/main/tests/unit/api/serializers/test_workflow_serializers.py
View File

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