From 798c8b631dec8346620f0b609ab3f25b7b655e7f Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Sat, 19 Nov 2016 21:26:35 -0500
Subject: [PATCH] Hide user settings category if no user settings are
 registered.

---
 awx/conf/registry.py | 8 +++++---
 awx/conf/views.py    | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/awx/conf/registry.py b/awx/conf/registry.py
index 8e90f8add3..0c48895c1c 100644
--- a/awx/conf/registry.py
+++ b/awx/conf/registry.py
@@ -54,14 +54,16 @@ class SettingsRegistry(object):
         categories = {
             'all': _('All'),
             'changed': _('Changed'),
-            'user': _('User'),
-            'user-defaults': _('User Defaults'),
         }
         for setting, kwargs in self._registry.items():
             category_slug = kwargs.get('category_slug', None)
             if category_slug is None or category_slug in categories:
                 continue
-            categories[category_slug] = kwargs.get('category', None) or category_slug
+            if category_slug == 'user':
+                categories['user'] = _('User')
+                categories['user-defaults'] = _('User-Defaults')
+            else:
+                categories[category_slug] = kwargs.get('category', None) or category_slug
         return categories
 
     def get_registered_settings(self, category_slug=None, read_only=None):
diff --git a/awx/conf/views.py b/awx/conf/views.py
index 432340737e..b18e5c5704 100644
--- a/awx/conf/views.py
+++ b/awx/conf/views.py
@@ -37,10 +37,13 @@ class SettingCategoryList(ListAPIView):
 
     def get_queryset(self):
         setting_categories = []
+        categories = settings_registry.get_registered_categories()
         if self.request.user.is_superuser or self.request.user.is_system_auditor:
-            categories = settings_registry.get_registered_categories()
+            pass  # categories = categories
+        elif 'user' in categories:
+            categories = {'user', _('User')}
         else:
-            categories = {'user': _('User')}
+            categories = {}
         for category_slug in sorted(categories.keys()):
             url = reverse('api:setting_singleton_detail', args=(category_slug,))
             setting_categories.append(SettingCategory(url, category_slug, categories[category_slug]))