entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 18 Releases Activity

user_name: fallback on default full name when var defined yet empty (#74507)
gitea/hobo/pipeline/head This commit looks good Details

This commit is contained in:
Paul Marillonnet 2023-02-23 14:51:29 +01:00
parent 5956ce4036
commit 111591a0b0
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hobo/user_name/apps.py
View File

@ -17,7 +17,7 @@ def get_full_name(user):
context = {}
context['user'] = user
template_vars = getattr(settings, 'TEMPLATE_VARS', {})
if 'user_full_name_template' in template_vars:
if template_vars.get('user_full_name_template'):
try:
template = engines['django'].from_string(template_vars['user_full_name_template'])
return template.render(context)

6
tests/test_user_name.py
View File

@ -36,9 +36,15 @@ def test_user_get_full_name_from_template(user):
):
assert get_full_name(user) == 'Jane bar'
with override_settings(TEMPLATE_VARS={'user_full_name_template': ''}):
assert get_full_name(user) == 'Jane Doe'
def test_user_get_full_name(user):
with override_settings(
TEMPLATE_VARS={'user_full_name_template': '{{ user.first_name }} {{ user.attributes.foo }}'}
):
assert user.get_full_name() == 'Jane bar'
with override_settings(TEMPLATE_VARS={'user_full_name_template': ''}):
assert user.get_full_name() == 'Jane Doe'

6
tests_authentic/test_user_name.py
View File

@ -49,6 +49,9 @@ def test_get_full_name_from_template_utils_from_multiple_attrs(db, tenant, setti
):
assert get_full_name(user) == 'Jane Milly Minnie'
with override_settings(TEMPLATE_VARS={'user_full_name_template': ''}):
assert get_full_name(user) == 'Jane Doe'
def test_get_full_name_from_template_accessor_from_multiple_attrs(db, tenant, settings):
with tenant_context(tenant):
@ -90,3 +93,6 @@ def test_get_full_name_from_template_accessor_from_multiple_attrs(db, tenant, se
}
):
assert user.get_full_name() == 'Jane Milly Minnie'
with override_settings(TEMPLATE_VARS={'user_full_name_template': ''}):
assert user.get_full_name() == 'Jane Doe'