settings: add search result template to minimal user templates page (#52665)
This commit is contained in:
parent
f3eb47d6f3
commit
3a427853a3
|
@ -433,13 +433,15 @@ def test_settings_user(pub):
|
||||||
pub.site_options.write(fd)
|
pub.site_options.write(fd)
|
||||||
|
|
||||||
resp = app.get('/backoffice/settings/')
|
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.forms['template']['sidebar_template'] = '{% if True %}'
|
||||||
resp = resp.forms['template'].submit()
|
resp = resp.forms['template'].submit()
|
||||||
assert 'syntax error in Django template' in resp
|
assert 'syntax error in Django template' in resp
|
||||||
resp.forms['template']['sidebar_template'] = 'hello {{ form_user_display_name }}'
|
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()
|
resp = resp.forms['template'].submit()
|
||||||
assert pub.cfg['users']['sidebar_template'] == 'hello {{ form_user_display_name }}'
|
assert pub.cfg['users']['sidebar_template'] == 'hello {{ form_user_display_name }}'
|
||||||
|
assert pub.cfg['users']['search_result_template'] == '{{ form_user_display_name }}'
|
||||||
|
|
||||||
# restore config
|
# restore config
|
||||||
pub.cfg['users']['field_email'] = None
|
pub.cfg['users']['field_email'] = None
|
||||||
|
|
|
@ -507,7 +507,7 @@ class SettingsDirectory(QommonSettingsDirectory):
|
||||||
'geolocation',
|
'geolocation',
|
||||||
'theme_preview',
|
'theme_preview',
|
||||||
'filetypes',
|
'filetypes',
|
||||||
('user-template', 'user_template'),
|
('user-templates', 'user_templates'),
|
||||||
('data-sources', 'data_sources'),
|
('data-sources', 'data_sources'),
|
||||||
'wscalls',
|
'wscalls',
|
||||||
'logs',
|
'logs',
|
||||||
|
@ -659,9 +659,9 @@ class SettingsDirectory(QommonSettingsDirectory):
|
||||||
r += htmltext('<dt><a href="users/">%s</a></dt> <dd>%s</dd>') % (_('Users'), _('Configure users'))
|
r += htmltext('<dt><a href="users/">%s</a></dt> <dd>%s</dd>') % (_('Users'), _('Configure users'))
|
||||||
else:
|
else:
|
||||||
# minimal options
|
# minimal options
|
||||||
r += htmltext('<dt><a href="user-template">%s</a></dt> <dd>%s</dd>') % (
|
r += htmltext('<dt><a href="user-templates">%s</a></dt> <dd>%s</dd>') % (
|
||||||
_('Users'),
|
_('Users'),
|
||||||
_('Configure sidebar template for users'),
|
_('Configure templates for users'),
|
||||||
)
|
)
|
||||||
if enabled('emails'):
|
if enabled('emails'):
|
||||||
r += htmltext('<dt><a href="emails/">%s</a></dt> <dd>%s</dd>') % (
|
r += htmltext('<dt><a href="emails/">%s</a></dt> <dd>%s</dd>') % (
|
||||||
|
@ -1374,19 +1374,25 @@ class SettingsDirectory(QommonSettingsDirectory):
|
||||||
r += form.render()
|
r += form.render()
|
||||||
return r.getvalue()
|
return r.getvalue()
|
||||||
|
|
||||||
def user_template(self):
|
def user_templates(self):
|
||||||
form = UserFieldsDirectory.sidebar_template_form(action='user-template')
|
form = UserFieldsDirectory.sidebar_template_form(action='user-templates')
|
||||||
form.get_widget('sidebar_template').set_title(_('Sidebar Template'))
|
form.get_widget('sidebar_template').set_title(_('Sidebar Template'))
|
||||||
form.add_submit('cancel', _('Cancel'))
|
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():
|
if form.get_widget('cancel').parse():
|
||||||
return redirect('.')
|
return redirect('.')
|
||||||
|
|
||||||
if form.is_submitted() and not form.has_errors():
|
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('.')
|
return redirect('.')
|
||||||
|
|
||||||
get_response().breadcrumb.append(('user-template', _('Users')))
|
get_response().breadcrumb.append(('user-templates', _('Users')))
|
||||||
html_top('settings', title=_('Users'))
|
html_top('settings', title=_('Users'))
|
||||||
r = TemplateIO(html=True)
|
r = TemplateIO(html=True)
|
||||||
r += htmltext('<h2>%s</h2>') % _('Users')
|
r += htmltext('<h2>%s</h2>') % _('Users')
|
||||||
|
|
Loading…
Reference in New Issue