From 87bf7d22e115cd20f59415f4a820c1d7ddd6e1e7 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Thu, 17 Nov 2016 17:11:58 -0500 Subject: [PATCH 1/3] Add organization to wfjt serializer related_fields. --- awx/api/serializers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 4fea827ec0..f7201eb64a 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2218,6 +2218,8 @@ class WorkflowJobTemplateSerializer(LabelsListMixin, UnifiedJobTemplateSerialize notification_templates_error = reverse('api:workflow_job_template_notification_templates_error_list', args=(obj.pk,)), survey_spec = reverse('api:workflow_job_template_survey_spec', args=(obj.pk,)), )) + if obj.organization: + res['organization'] = reverse('api:organization_detail', args=(obj.organization.pk,)) return res def validate_extra_vars(self, value): From 8eb4b7b2717c96f63f918e96f846615d5020badd Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Fri, 25 Nov 2016 22:02:23 -0500 Subject: [PATCH 2/3] Add reversed relationship. --- awx/api/serializers.py | 1 + awx/api/urls.py | 1 + awx/api/views.py | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index f7201eb64a..fc44eb5c11 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -839,6 +839,7 @@ class OrganizationSerializer(BaseSerializer): res.update(dict( projects = reverse('api:organization_projects_list', args=(obj.pk,)), inventories = reverse('api:organization_inventories_list', args=(obj.pk,)), + workflow_job_templates = reverse('api:organization_workflow_job_templates_list', args=(obj.pk,)), users = reverse('api:organization_users_list', args=(obj.pk,)), admins = reverse('api:organization_admins_list', args=(obj.pk,)), teams = reverse('api:organization_teams_list', args=(obj.pk,)), diff --git a/awx/api/urls.py b/awx/api/urls.py index f0bc97e99e..4391de849d 100644 --- a/awx/api/urls.py +++ b/awx/api/urls.py @@ -18,6 +18,7 @@ organization_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/admins/$', 'organization_admins_list'), url(r'^(?P[0-9]+)/inventories/$', 'organization_inventories_list'), url(r'^(?P[0-9]+)/projects/$', 'organization_projects_list'), + url(r'^(?P[0-9]+)/workflow_job_templates/$', 'organization_workflow_job_templates_list'), url(r'^(?P[0-9]+)/teams/$', 'organization_teams_list'), url(r'^(?P[0-9]+)/credentials/$', 'organization_credential_list'), url(r'^(?P[0-9]+)/activity_stream/$', 'organization_activity_stream_list'), diff --git a/awx/api/views.py b/awx/api/views.py index 79445dacd0..bbb4c990b8 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -764,6 +764,15 @@ class OrganizationProjectsList(SubListCreateAttachDetachAPIView): parent_key = 'organization' +class OrganizationWorkflowJobTemplatesList(SubListCreateAttachDetachAPIView): + + model = WorkflowJobTemplate + serializer_class = WorkflowJobTemplateListSerializer + parent_model = Organization + relationship = 'workflows' + parent_key = 'organization' + + class OrganizationTeamsList(SubListCreateAttachDetachAPIView): model = Team From f0b65d36bd63e072e81b6481165bcc4e64e43074 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Sat, 26 Nov 2016 12:10:21 -0500 Subject: [PATCH 3/3] Add new version indicator --- awx/api/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/api/views.py b/awx/api/views.py index bbb4c990b8..6da87f1c14 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -771,6 +771,7 @@ class OrganizationWorkflowJobTemplatesList(SubListCreateAttachDetachAPIView): parent_model = Organization relationship = 'workflows' parent_key = 'organization' + new_in_310 = True class OrganizationTeamsList(SubListCreateAttachDetachAPIView):