diff --git a/tests/admin_pages/test_settings.py b/tests/admin_pages/test_settings.py index 76b8b473b..286b5ef47 100644 --- a/tests/admin_pages/test_settings.py +++ b/tests/admin_pages/test_settings.py @@ -433,13 +433,15 @@ def test_settings_user(pub): pub.site_options.write(fd) resp = app.get('/backoffice/settings/') - resp = resp.click('Users', href='user-template') + resp = resp.click('Users', href='user-templates') resp.forms['template']['sidebar_template'] = '{% if True %}' resp = resp.forms['template'].submit() assert 'syntax error in Django template' in resp resp.forms['template']['sidebar_template'] = 'hello {{ form_user_display_name }}' + resp.forms['template']['search_result_template'] = '{{ form_user_display_name }}' resp = resp.forms['template'].submit() assert pub.cfg['users']['sidebar_template'] == 'hello {{ form_user_display_name }}' + assert pub.cfg['users']['search_result_template'] == '{{ form_user_display_name }}' # restore config pub.cfg['users']['field_email'] = None diff --git a/wcs/admin/settings.py b/wcs/admin/settings.py index 25f456b26..74264fa8e 100644 --- a/wcs/admin/settings.py +++ b/wcs/admin/settings.py @@ -507,7 +507,7 @@ class SettingsDirectory(QommonSettingsDirectory): 'geolocation', 'theme_preview', 'filetypes', - ('user-template', 'user_template'), + ('user-templates', 'user_templates'), ('data-sources', 'data_sources'), 'wscalls', 'logs', @@ -659,9 +659,9 @@ class SettingsDirectory(QommonSettingsDirectory): r += htmltext('
%s
%s
') % (_('Users'), _('Configure users')) else: # minimal options - r += htmltext('
%s
%s
') % ( + r += htmltext('
%s
%s
') % ( _('Users'), - _('Configure sidebar template for users'), + _('Configure templates for users'), ) if enabled('emails'): r += htmltext('
%s
%s
') % ( @@ -1374,19 +1374,25 @@ class SettingsDirectory(QommonSettingsDirectory): r += form.render() return r.getvalue() - def user_template(self): - form = UserFieldsDirectory.sidebar_template_form(action='user-template') + def user_templates(self): + form = UserFieldsDirectory.sidebar_template_form(action='user-templates') form.get_widget('sidebar_template').set_title(_('Sidebar Template')) form.add_submit('cancel', _('Cancel')) + form2 = UserFieldsDirectory.search_result_template_form(action='user-templates') + widget = form2.get_widget('search_result_template') + widget.set_title(_('Search Result Template')) + form.widgets.append(widget) + form._names['search_result_template'] = widget + if form.get_widget('cancel').parse(): return redirect('.') if form.is_submitted() and not form.has_errors(): - cfg_submit(form, 'users', ['sidebar_template']) + cfg_submit(form, 'users', ['sidebar_template', 'search_result_template']) return redirect('.') - get_response().breadcrumb.append(('user-template', _('Users'))) + get_response().breadcrumb.append(('user-templates', _('Users'))) html_top('settings', title=_('Users')) r = TemplateIO(html=True) r += htmltext('

%s

') % _('Users')