matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove support for 'hidden' smart settings

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-22 01:18:38 -04:00
parent 50e547dc98
commit 6dcb984aca
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/dynamic_search/settings.py
View File

@@ -8,7 +8,7 @@ register_settings(
namespace='dynamic_search', namespace='dynamic_search',
module='dynamic_search.settings', module='dynamic_search.settings',
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': '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.')}, {'name': 'RECENT_COUNT', 'global_name': 'SEARCH_RECENT_COUNT', 'default': 5, 'description': _('Maximum number of search queries to remember per user.')},
] ]

41
mayan/apps/smart_settings/views.py
View File

@@ -16,15 +16,14 @@ def setting_list(request):
new_settings = [] new_settings = []
for namespace, sub_settings in settings.items(): for namespace, sub_settings in settings.items():
for sub_setting in sub_settings: for sub_setting in sub_settings:
if not sub_setting.get('hidden', False): new_settings.append({
new_settings.append({ 'module': sub_setting['module'],
'module': sub_setting['module'], 'name': sub_setting['name'],
'name': sub_setting['name'], 'global_name': sub_setting['global_name'],
'global_name': sub_setting['global_name'], 'description': sub_setting.get('description', None),
'description': sub_setting.get('description', None), 'exists': sub_setting.get('exists', False),
'exists': sub_setting.get('exists', False), 'default': sub_setting['default'],
'default': sub_setting['default'], })
})
context = { context = {
'title': _('Settings'), 'title': _('Settings'),
@@ -32,15 +31,25 @@ def setting_list(request):
'hide_link': True, 'hide_link': True,
'hide_object': True, 'hide_object': True,
'extra_columns': [ 'extra_columns': [
{'name': _('Name'), 'attribute': encapsulate(lambda x: mark_safe('<span style="font-weight: bold;">%s</span><br />%s' % (x.get('global_name'), x.get('description'))))},
{ {
'name': _('Value'), 'attribute': encapsulate(lambda x: mark_safe('<div class="nowrap">%s&nbsp;%s</div>' % ( 'name': _('Name'),
return_type(getattr(x['module'], x['name'])), 'attribute': encapsulate(lambda x: mark_safe('<span style="font-weight: bold;">%s</span><br />%s' % (x.get('global_name'), x.get('description'))))
exists_widget(getattr(x['module'], x['name'])) if x['exists'] else '' },
))) {
'name': _('Value'),
'attribute': encapsulate(
lambda x: mark_safe(
'<div class="nowrap">%s&nbsp;%s</div>' % (
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, return render_to_response(
context_instance=RequestContext(request)) 'appearance/generic_list.html', context,
context_instance=RequestContext(request)
)