External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 22:19:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Optionally add the webhook_credential link to related

Browse Source 
on JTs and WFJTs.
This commit is contained in:
Jeff Bradberry
2020-03-26 15:25:51 -04:00
parent 9dbf75f2a9
commit 6b3befcb94
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -2900,6 +2900,8 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO
res['callback'] = self.reverse('api:job_template_callback', kwargs={'pk': obj.pk}) res['callback'] = self.reverse('api:job_template_callback', kwargs={'pk': obj.pk})
if obj.organization_id: if obj.organization_id:
res['organization'] = self.reverse('api:organization_detail', kwargs={'pk': obj.organization_id}) res['organization'] = self.reverse('api:organization_detail', kwargs={'pk': obj.organization_id})
if obj.webhook_credential_id:
res['webhook_credential'] = self.reverse('api:credential_detail', kwargs={'pk': obj.webhook_credential_id})
return res return res
def validate(self, attrs): def validate(self, attrs):
@@ -3390,6 +3392,8 @@ class WorkflowJobTemplateSerializer(JobTemplateMixin, LabelsListMixin, UnifiedJo
) )
if obj.organization: if obj.organization:
res['organization'] = self.reverse('api:organization_detail', kwargs={'pk': obj.organization.pk}) res['organization'] = self.reverse('api:organization_detail', kwargs={'pk': obj.organization.pk})
if obj.webhook_credential_id:
res['webhook_credential'] = self.reverse('api:credential_detail', kwargs={'pk': obj.webhook_credential_id})
return res return res
def validate_extra_vars(self, value): def validate_extra_vars(self, value):

1
awx/main/tests/unit/api/serializers/test_job_template_serializers.py
View File

@@ -31,6 +31,7 @@ def job_template(mocker):
mock_jt.validation_errors = mock_JT_resource_data mock_jt.validation_errors = mock_JT_resource_data
mock_jt.webhook_service = '' mock_jt.webhook_service = ''
mock_jt.organization_id = None mock_jt.organization_id = None
mock_jt.webhook_credential_id = None
return mock_jt return mock_jt