From 3850b96da2e7f405cd36407be0418095e4798ad9 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Wed, 3 Aug 2016 14:56:09 -0400 Subject: [PATCH] Re-enable API settings URLs. --- awx/api/urls.py | 3 +-- awx/api/views.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/api/urls.py b/awx/api/urls.py index 19ecdd3e1b..5d906a29b1 100644 --- a/awx/api/urls.py +++ b/awx/api/urls.py @@ -295,8 +295,7 @@ v1_urls = patterns('awx.api.views', url(r'^me/$', 'user_me_list'), url(r'^dashboard/$', 'dashboard_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'^organizations/', include(organization_urls)), url(r'^users/', include(user_urls)), diff --git a/awx/api/views.py b/awx/api/views.py index 7d1a855ed7..21960aa68d 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -118,8 +118,7 @@ class ApiV1RootView(APIView): data['authtoken'] = reverse('api:auth_token_view') data['ping'] = reverse('api:api_v1_ping_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['dashboard'] = reverse('api:dashboard_view') data['organizations'] = reverse('api:organization_list')