External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix problem with the tests by dynamically setting the view model

Browse Source 
instead of using a model @property or lookup method.
This commit is contained in:
Jeff Bradberry
2019-08-16 14:56:25 -04:00
parent edb9d6b16c
commit 2310413dc0
3 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/urls/job_template.py
View File

@@ -3,6 +3,7 @@
from django.conf.urls import include, url
from awx.main.models import JobTemplate
from awx.api.views import (
JobTemplateList,
JobTemplateDetail,
@@ -45,7 +46,7 @@ urls = [
url(r'^(?P<pk>[0-9]+)/object_roles/$', JobTemplateObjectRolesList.as_view(), name='job_template_object_roles_list'),
url(r'^(?P<pk>[0-9]+)/labels/$', JobTemplateLabelList.as_view(), name='job_template_label_list'),
url(r'^(?P<pk>[0-9]+)/copy/$', JobTemplateCopy.as_view(), name='job_template_copy'),
url(r'^(?P<pk>[0-9]+)/', include('awx.api.urls.webhooks'), {'model_kwarg': 'job_templates'}),
url(r'^(?P<pk>[0-9]+)/', include('awx.api.urls.webhooks'), {'model_kwarg': 'job_templates', 'model': JobTemplate}),
]
__all__ = ['urls']

3
awx/api/urls/workflow_job_template.py
View File

@@ -3,6 +3,7 @@
from django.conf.urls import include, url
from awx.main.models import WorkflowJobTemplate
from awx.api.views import (
WorkflowJobTemplateList,
WorkflowJobTemplateDetail,
@@ -44,7 +45,7 @@ urls = [
url(r'^(?P<pk>[0-9]+)/access_list/$', WorkflowJobTemplateAccessList.as_view(), name='workflow_job_template_access_list'),
url(r'^(?P<pk>[0-9]+)/object_roles/$', WorkflowJobTemplateObjectRolesList.as_view(), name='workflow_job_template_object_roles_list'),
url(r'^(?P<pk>[0-9]+)/labels/$', WorkflowJobTemplateLabelList.as_view(), name='workflow_job_template_label_list'),
url(r'^(?P<pk>[0-9]+)/', include('awx.api.urls.webhooks'), {'model_kwarg': 'workflow_job_templates'}),
url(r'^(?P<pk>[0-9]+)/', include('awx.api.urls.webhooks'), {'model_kwarg': 'workflow_job_templates', 'model': WorkflowJobTemplate}),
]
__all__ = ['urls']