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

Hide user settings category if no user settings are registered.

Browse Source
This commit is contained in:
Chris Church
2016-11-19 21:26:35 -05:00
parent 34b638f59d
commit 798c8b631d
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/conf/registry.py
View File

@@ -54,14 +54,16 @@ class SettingsRegistry(object):
categories = { categories = {
'all': _('All'), 'all': _('All'),
'changed': _('Changed'), 'changed': _('Changed'),
'user': _('User'),
'user-defaults': _('User Defaults'),
} }
for setting, kwargs in self._registry.items(): for setting, kwargs in self._registry.items():
category_slug = kwargs.get('category_slug', None) category_slug = kwargs.get('category_slug', None)
if category_slug is None or category_slug in categories: if category_slug is None or category_slug in categories:
continue 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 return categories
def get_registered_settings(self, category_slug=None, read_only=None): def get_registered_settings(self, category_slug=None, read_only=None):

7
awx/conf/views.py
View File

@@ -37,10 +37,13 @@ class SettingCategoryList(ListAPIView):
def get_queryset(self): def get_queryset(self):
setting_categories = [] setting_categories = []
categories = settings_registry.get_registered_categories()
if self.request.user.is_superuser or self.request.user.is_system_auditor: 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: else:
categories = {'user': _('User')} categories = {}
for category_slug in sorted(categories.keys()): for category_slug in sorted(categories.keys()):
url = reverse('api:setting_singleton_detail', args=(category_slug,)) url = reverse('api:setting_singleton_detail', args=(category_slug,))
setting_categories.append(SettingCategory(url, category_slug, categories[category_slug])) setting_categories.append(SettingCategory(url, category_slug, categories[category_slug]))