From edb9d6b16c05312ba5014b3479e189391c6170cb Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Fri, 16 Aug 2019 14:26:32 -0400 Subject: [PATCH] Add the related link to the webhook secrets view to the serializers --- awx/api/serializers.py | 51 +++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 8100a78114..2b8834bb62 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2838,30 +2838,34 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO class Meta: model = JobTemplate - fields = ('*', 'host_config_key', 'ask_scm_branch_on_launch', 'ask_diff_mode_on_launch', 'ask_variables_on_launch', - 'ask_limit_on_launch', 'ask_tags_on_launch', - 'ask_skip_tags_on_launch', 'ask_job_type_on_launch', 'ask_verbosity_on_launch', 'ask_inventory_on_launch', - 'ask_credential_on_launch', 'survey_enabled', 'become_enabled', 'diff_mode', - 'allow_simultaneous', 'custom_virtualenv', 'job_slice_count') + fields = ( + '*', 'host_config_key', 'ask_scm_branch_on_launch', 'ask_diff_mode_on_launch', + 'ask_variables_on_launch', 'ask_limit_on_launch', 'ask_tags_on_launch', + 'ask_skip_tags_on_launch', 'ask_job_type_on_launch', 'ask_verbosity_on_launch', + 'ask_inventory_on_launch', 'ask_credential_on_launch', 'survey_enabled', + 'become_enabled', 'diff_mode', 'allow_simultaneous', 'custom_virtualenv', + 'job_slice_count' + ) def get_related(self, obj): res = super(JobTemplateSerializer, self).get_related(obj) - res.update(dict( - jobs = self.reverse('api:job_template_jobs_list', kwargs={'pk': obj.pk}), - schedules = self.reverse('api:job_template_schedules_list', kwargs={'pk': obj.pk}), - activity_stream = self.reverse('api:job_template_activity_stream_list', kwargs={'pk': obj.pk}), - launch = self.reverse('api:job_template_launch', kwargs={'pk': obj.pk}), - notification_templates_started = self.reverse('api:job_template_notification_templates_started_list', kwargs={'pk': obj.pk}), - notification_templates_success = self.reverse('api:job_template_notification_templates_success_list', kwargs={'pk': obj.pk}), - notification_templates_error = self.reverse('api:job_template_notification_templates_error_list', kwargs={'pk': obj.pk}), - access_list = self.reverse('api:job_template_access_list', kwargs={'pk': obj.pk}), - survey_spec = self.reverse('api:job_template_survey_spec', kwargs={'pk': obj.pk}), - labels = self.reverse('api:job_template_label_list', kwargs={'pk': obj.pk}), - object_roles = self.reverse('api:job_template_object_roles_list', kwargs={'pk': obj.pk}), - instance_groups = self.reverse('api:job_template_instance_groups_list', kwargs={'pk': obj.pk}), - slice_workflow_jobs = self.reverse('api:job_template_slice_workflow_jobs_list', kwargs={'pk': obj.pk}), - copy = self.reverse('api:job_template_copy', kwargs={'pk': obj.pk}), - )) + res.update( + jobs=self.reverse('api:job_template_jobs_list', kwargs={'pk': obj.pk}), + schedules=self.reverse('api:job_template_schedules_list', kwargs={'pk': obj.pk}), + activity_stream=self.reverse('api:job_template_activity_stream_list', kwargs={'pk': obj.pk}), + launch=self.reverse('api:job_template_launch', kwargs={'pk': obj.pk}), + webhook_key=self.reverse('api:webhook_key', kwargs={'model_kwarg': 'job_templates', 'pk': obj.pk}), + notification_templates_started=self.reverse('api:job_template_notification_templates_started_list', kwargs={'pk': obj.pk}), + notification_templates_success=self.reverse('api:job_template_notification_templates_success_list', kwargs={'pk': obj.pk}), + notification_templates_error=self.reverse('api:job_template_notification_templates_error_list', kwargs={'pk': obj.pk}), + access_list=self.reverse('api:job_template_access_list', kwargs={'pk': obj.pk}), + survey_spec=self.reverse('api:job_template_survey_spec', kwargs={'pk': obj.pk}), + labels=self.reverse('api:job_template_label_list', kwargs={'pk': obj.pk}), + object_roles=self.reverse('api:job_template_object_roles_list', kwargs={'pk': obj.pk}), + instance_groups=self.reverse('api:job_template_instance_groups_list', kwargs={'pk': obj.pk}), + slice_workflow_jobs=self.reverse('api:job_template_slice_workflow_jobs_list', kwargs={'pk': obj.pk}), + copy=self.reverse('api:job_template_copy', kwargs={'pk': obj.pk}), + ) if obj.host_config_key: res['callback'] = self.reverse('api:job_template_callback', kwargs={'pk': obj.pk}) return res @@ -3326,10 +3330,11 @@ class WorkflowJobTemplateSerializer(JobTemplateMixin, LabelsListMixin, UnifiedJo def get_related(self, obj): res = super(WorkflowJobTemplateSerializer, self).get_related(obj) - res.update(dict( + res.update( workflow_jobs = self.reverse('api:workflow_job_template_jobs_list', kwargs={'pk': obj.pk}), schedules = self.reverse('api:workflow_job_template_schedules_list', kwargs={'pk': obj.pk}), launch = self.reverse('api:workflow_job_template_launch', kwargs={'pk': obj.pk}), + webhook_key=self.reverse('api:webhook_key', kwargs={'model_kwarg': 'workflow_job_templates', 'pk': obj.pk}), workflow_nodes = self.reverse('api:workflow_job_template_workflow_nodes_list', kwargs={'pk': obj.pk}), labels = self.reverse('api:workflow_job_template_label_list', kwargs={'pk': obj.pk}), activity_stream = self.reverse('api:workflow_job_template_activity_stream_list', kwargs={'pk': obj.pk}), @@ -3341,7 +3346,7 @@ class WorkflowJobTemplateSerializer(JobTemplateMixin, LabelsListMixin, UnifiedJo object_roles = self.reverse('api:workflow_job_template_object_roles_list', kwargs={'pk': obj.pk}), survey_spec = self.reverse('api:workflow_job_template_survey_spec', kwargs={'pk': obj.pk}), copy = self.reverse('api:workflow_job_template_copy', kwargs={'pk': obj.pk}), - )) + ) if obj.organization: res['organization'] = self.reverse('api:organization_detail', kwargs={'pk': obj.organization.pk}) return res