From b0c530402f6f4381c5017f89635f68e11fd73432 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 8 Aug 2019 14:58:57 -0400 Subject: [PATCH] Move the webhook url include from the top level urlconf to the JT/WFJT urlconfs --- awx/api/urls/job_template.py | 3 ++- awx/api/urls/urls.py | 2 -- awx/api/urls/workflow_job_template.py | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/api/urls/job_template.py b/awx/api/urls/job_template.py index 922019d117..77252eb7e3 100644 --- a/awx/api/urls/job_template.py +++ b/awx/api/urls/job_template.py @@ -1,7 +1,7 @@ # Copyright (c) 2017 Ansible, Inc. # All Rights Reserved. -from django.conf.urls import url +from django.conf.urls import include, url from awx.api.views import ( JobTemplateList, @@ -45,6 +45,7 @@ urls = [ url(r'^(?P[0-9]+)/object_roles/$', JobTemplateObjectRolesList.as_view(), name='job_template_object_roles_list'), url(r'^(?P[0-9]+)/labels/$', JobTemplateLabelList.as_view(), name='job_template_label_list'), url(r'^(?P[0-9]+)/copy/$', JobTemplateCopy.as_view(), name='job_template_copy'), + url(r'^(?P[0-9]+)/', include('awx.api.urls.webhooks'), {'model_kwarg': 'job_templates'}), ] __all__ = ['urls'] diff --git a/awx/api/urls/urls.py b/awx/api/urls/urls.py index af62c29541..ab7d61fd23 100644 --- a/awx/api/urls/urls.py +++ b/awx/api/urls/urls.py @@ -137,8 +137,6 @@ v2_urls = [ url(r'^activity_stream/', include(activity_stream_urls)), url(r'^workflow_approval_templates/', include(workflow_approval_template_urls)), url(r'^workflow_approvals/', include(workflow_approval_urls)), - url(r'^(?Pjob_templates|workflow_job_templates)/(?P[0-9]+)/', - include('awx.api.urls.webhooks')), ] diff --git a/awx/api/urls/workflow_job_template.py b/awx/api/urls/workflow_job_template.py index 349dad1aa5..b9deda499a 100644 --- a/awx/api/urls/workflow_job_template.py +++ b/awx/api/urls/workflow_job_template.py @@ -1,7 +1,7 @@ # Copyright (c) 2017 Ansible, Inc. # All Rights Reserved. -from django.conf.urls import url +from django.conf.urls import include, url from awx.api.views import ( WorkflowJobTemplateList, @@ -44,6 +44,7 @@ urls = [ url(r'^(?P[0-9]+)/access_list/$', WorkflowJobTemplateAccessList.as_view(), name='workflow_job_template_access_list'), url(r'^(?P[0-9]+)/object_roles/$', WorkflowJobTemplateObjectRolesList.as_view(), name='workflow_job_template_object_roles_list'), url(r'^(?P[0-9]+)/labels/$', WorkflowJobTemplateLabelList.as_view(), name='workflow_job_template_label_list'), + url(r'^(?P[0-9]+)/', include('awx.api.urls.webhooks'), {'model_kwarg': 'workflow_job_templates'}), ] __all__ = ['urls']