user_name: fallback on default full name when var defined yet empty (#74507)
gitea/hobo/pipeline/head This commit looks good
Details
gitea/hobo/pipeline/head This commit looks good
Details
This commit is contained in:
parent
5956ce4036
commit
111591a0b0
|
@ -17,7 +17,7 @@ def get_full_name(user):
|
||||||
context = {}
|
context = {}
|
||||||
context['user'] = user
|
context['user'] = user
|
||||||
template_vars = getattr(settings, 'TEMPLATE_VARS', {})
|
template_vars = getattr(settings, 'TEMPLATE_VARS', {})
|
||||||
if 'user_full_name_template' in template_vars:
|
if template_vars.get('user_full_name_template'):
|
||||||
try:
|
try:
|
||||||
template = engines['django'].from_string(template_vars['user_full_name_template'])
|
template = engines['django'].from_string(template_vars['user_full_name_template'])
|
||||||
return template.render(context)
|
return template.render(context)
|
||||||
|
|
|
@ -36,9 +36,15 @@ def test_user_get_full_name_from_template(user):
|
||||||
):
|
):
|
||||||
assert get_full_name(user) == 'Jane bar'
|
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):
|
def test_user_get_full_name(user):
|
||||||
with override_settings(
|
with override_settings(
|
||||||
TEMPLATE_VARS={'user_full_name_template': '{{ user.first_name }} {{ user.attributes.foo }}'}
|
TEMPLATE_VARS={'user_full_name_template': '{{ user.first_name }} {{ user.attributes.foo }}'}
|
||||||
):
|
):
|
||||||
assert user.get_full_name() == 'Jane bar'
|
assert user.get_full_name() == 'Jane bar'
|
||||||
|
|
||||||
|
with override_settings(TEMPLATE_VARS={'user_full_name_template': ''}):
|
||||||
|
assert user.get_full_name() == 'Jane Doe'
|
||||||
|
|
|
@ -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'
|
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):
|
def test_get_full_name_from_template_accessor_from_multiple_attrs(db, tenant, settings):
|
||||||
with tenant_context(tenant):
|
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'
|
assert user.get_full_name() == 'Jane Milly Minnie'
|
||||||
|
|
||||||
|
with override_settings(TEMPLATE_VARS={'user_full_name_template': ''}):
|
||||||
|
assert user.get_full_name() == 'Jane Doe'
|
||||||
|
|
Loading…
Reference in New Issue