External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4112 from jangsutsr/4054_add_org_to_wfjt_related_fields

Browse Source 
Add org to wfjt related fields
This commit is contained in:
Aaron Tan
2016-11-26 16:12:07 -05:00
committed by GitHub
parent a27ab393de f0b65d36bd
commit d7c9ff209d
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/serializers.py
View File

@@ -841,6 +841,7 @@ class OrganizationSerializer(BaseSerializer):
res.update(dict( res.update(dict(
projects = reverse('api:organization_projects_list', args=(obj.pk,)), projects = reverse('api:organization_projects_list', args=(obj.pk,)),
inventories = reverse('api:organization_inventories_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,)), users = reverse('api:organization_users_list', args=(obj.pk,)),
admins = reverse('api:organization_admins_list', args=(obj.pk,)), admins = reverse('api:organization_admins_list', args=(obj.pk,)),
teams = reverse('api:organization_teams_list', args=(obj.pk,)), teams = reverse('api:organization_teams_list', args=(obj.pk,)),
@@ -2237,6 +2238,8 @@ class WorkflowJobTemplateSerializer(JobTemplateMixin, LabelsListMixin, UnifiedJo
object_roles = reverse('api:workflow_job_template_object_roles_list', args=(obj.pk,)), object_roles = reverse('api:workflow_job_template_object_roles_list', args=(obj.pk,)),
survey_spec = reverse('api:workflow_job_template_survey_spec', 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 return res
def validate_extra_vars(self, value): def validate_extra_vars(self, value):

1
awx/api/urls.py
View File

@@ -18,6 +18,7 @@ organization_urls = patterns('awx.api.views',
url(r'^(?P<pk>[0-9]+)/admins/$', 'organization_admins_list'), url(r'^(?P<pk>[0-9]+)/admins/$', 'organization_admins_list'),
url(r'^(?P<pk>[0-9]+)/inventories/$', 'organization_inventories_list'), url(r'^(?P<pk>[0-9]+)/inventories/$', 'organization_inventories_list'),
url(r'^(?P<pk>[0-9]+)/projects/$', 'organization_projects_list'), url(r'^(?P<pk>[0-9]+)/projects/$', 'organization_projects_list'),
url(r'^(?P<pk>[0-9]+)/workflow_job_templates/$', 'organization_workflow_job_templates_list'),
url(r'^(?P<pk>[0-9]+)/teams/$', 'organization_teams_list'), url(r'^(?P<pk>[0-9]+)/teams/$', 'organization_teams_list'),
url(r'^(?P<pk>[0-9]+)/credentials/$', 'organization_credential_list'), url(r'^(?P<pk>[0-9]+)/credentials/$', 'organization_credential_list'),
url(r'^(?P<pk>[0-9]+)/activity_stream/$', 'organization_activity_stream_list'), url(r'^(?P<pk>[0-9]+)/activity_stream/$', 'organization_activity_stream_list'),

10
awx/api/views.py
View File

@@ -767,6 +767,16 @@ class OrganizationProjectsList(SubListCreateAttachDetachAPIView):
parent_key = 'organization' parent_key = 'organization'
class OrganizationWorkflowJobTemplatesList(SubListCreateAttachDetachAPIView):
model = WorkflowJobTemplate
serializer_class = WorkflowJobTemplateListSerializer
parent_model = Organization
relationship = 'workflows'
parent_key = 'organization'
new_in_310 = True
class OrganizationTeamsList(SubListCreateAttachDetachAPIView): class OrganizationTeamsList(SubListCreateAttachDetachAPIView):
model = Team model = Team