diff --git a/mayan/apps/dynamic_search/settings.py b/mayan/apps/dynamic_search/settings.py index f4f1d151d7..1db80e0705 100644 --- a/mayan/apps/dynamic_search/settings.py +++ b/mayan/apps/dynamic_search/settings.py @@ -8,7 +8,7 @@ register_settings( namespace='dynamic_search', module='dynamic_search.settings', settings=[ - {'name': 'SHOW_OBJECT_TYPE', 'global_name': 'SEARCH_SHOW_OBJECT_TYPE', 'default': True, 'hidden': True}, + {'name': 'SHOW_OBJECT_TYPE', 'global_name': 'SEARCH_SHOW_OBJECT_TYPE', 'default': True}, {'name': 'LIMIT', 'global_name': 'SEARCH_LIMIT', 'default': 100, 'description': _('Maximum amount search hits to fetch and display.')}, {'name': 'RECENT_COUNT', 'global_name': 'SEARCH_RECENT_COUNT', 'default': 5, 'description': _('Maximum number of search queries to remember per user.')}, ] diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py index 8fee01e6ae..3ecf82afe7 100644 --- a/mayan/apps/smart_settings/views.py +++ b/mayan/apps/smart_settings/views.py @@ -16,15 +16,14 @@ def setting_list(request): new_settings = [] for namespace, sub_settings in settings.items(): for sub_setting in sub_settings: - if not sub_setting.get('hidden', False): - new_settings.append({ - 'module': sub_setting['module'], - 'name': sub_setting['name'], - 'global_name': sub_setting['global_name'], - 'description': sub_setting.get('description', None), - 'exists': sub_setting.get('exists', False), - 'default': sub_setting['default'], - }) + new_settings.append({ + 'module': sub_setting['module'], + 'name': sub_setting['name'], + 'global_name': sub_setting['global_name'], + 'description': sub_setting.get('description', None), + 'exists': sub_setting.get('exists', False), + 'default': sub_setting['default'], + }) context = { 'title': _('Settings'), @@ -32,15 +31,25 @@ def setting_list(request): 'hide_link': True, 'hide_object': True, 'extra_columns': [ - {'name': _('Name'), 'attribute': encapsulate(lambda x: mark_safe('%s
%s' % (x.get('global_name'), x.get('description'))))}, { - 'name': _('Value'), 'attribute': encapsulate(lambda x: mark_safe('
%s %s
' % ( - return_type(getattr(x['module'], x['name'])), - exists_widget(getattr(x['module'], x['name'])) if x['exists'] else '' - ))) + 'name': _('Name'), + 'attribute': encapsulate(lambda x: mark_safe('%s
%s' % (x.get('global_name'), x.get('description')))) + }, + { + 'name': _('Value'), + 'attribute': encapsulate( + lambda x: mark_safe( + '
%s %s
' % ( + return_type(getattr(x['module'], x['name'])), + exists_widget(getattr(x['module'], x['name'])) if x['exists'] else '' + ) + ) + ) }, ] } - return render_to_response('appearance/generic_list.html', context, - context_instance=RequestContext(request)) + return render_to_response( + 'appearance/generic_list.html', context, + context_instance=RequestContext(request) + )