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

Re-enable API settings URLs.

Browse Source
This commit is contained in:
Chris Church
2016-08-03 14:56:09 -04:00
parent 572f62e22a
commit 3850b96da2
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/urls.py
View File

@@ -295,8 +295,7 @@ v1_urls = patterns('awx.api.views',
url(r'^me/$', 'user_me_list'), url(r'^me/$', 'user_me_list'),
url(r'^dashboard/$', 'dashboard_view'), url(r'^dashboard/$', 'dashboard_view'),
url(r'^dashboard/graphs/jobs/$','dashboard_jobs_graph_view'), url(r'^dashboard/graphs/jobs/$','dashboard_jobs_graph_view'),
# TODO: Uncomment aftger 3.0 when we bring database settings endpoints back url(r'^settings/', include(settings_urls)),
# url(r'^settings/', include(settings_urls)),
url(r'^schedules/', include(schedule_urls)), url(r'^schedules/', include(schedule_urls)),
url(r'^organizations/', include(organization_urls)), url(r'^organizations/', include(organization_urls)),
url(r'^users/', include(user_urls)), url(r'^users/', include(user_urls)),

3
awx/api/views.py
View File

@@ -118,8 +118,7 @@ class ApiV1RootView(APIView):
data['authtoken'] = reverse('api:auth_token_view') data['authtoken'] = reverse('api:auth_token_view')
data['ping'] = reverse('api:api_v1_ping_view') data['ping'] = reverse('api:api_v1_ping_view')
data['config'] = reverse('api:api_v1_config_view') data['config'] = reverse('api:api_v1_config_view')
# TODO: Uncomment after 3.0 when we bring database settings endpoints back data['settings'] = reverse('api:settings_list')
# data['settings'] = reverse('api:settings_list')
data['me'] = reverse('api:user_me_list') data['me'] = reverse('api:user_me_list')
data['dashboard'] = reverse('api:dashboard_view') data['dashboard'] = reverse('api:dashboard_view')
data['organizations'] = reverse('api:organization_list') data['organizations'] = reverse('api:organization_list')