user_name: fallback on default full name when var defined yet empty (#74507)

Jenkinsfile

@@ -30,10 +30,18 @@ python3 -m venv ./venv/
         stage('Packaging') {
             steps {
                 script {
-                    if (env.JOB_NAME == 'hobo' && env.GIT_BRANCH == 'origin/main') {
-                        sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye hobo'
+                    env.SHORT_JOB_NAME=sh(
+                        returnStdout: true,
+                        // given JOB_NAME=gitea/project/PR-46, returns project
+                        // given JOB_NAME=project/main, returns project
+                        script: '''
+                            echo "${JOB_NAME}" | sed "s/gitea\\///" | awk -F/ '{print $1}'
+                        '''
+                    ).trim()
+                    if (env.GIT_BRANCH == 'main' || env.GIT_BRANCH == 'origin/main') {
+                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye ${SHORT_JOB_NAME}"
                     } else if (env.GIT_BRANCH.startsWith('hotfix/')) {
-                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye --branch ${env.GIT_BRANCH} --hotfix hobo"
+                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye --branch ${env.GIT_BRANCH} --hotfix ${SHORT_JOB_NAME}"
                     }
                 }
             }

hobo/user_name/apps.py

@@ -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)

tests/test_manager.py

@@ -98,6 +98,11 @@ def test_edit_user_full_name_template(logged_app, admin_user, settings):
     page.click('Cancel')
     assert Variable.objects.get(name='user_full_name_template').value == value
 
+    page = app.get('/profile/edit-user-full-name-template', status=200)
+    page.form['user_full_name_template'] = ''
+    page.form.submit()
+    assert Variable.objects.get(name='user_full_name_template') == ''
+
 
 def test_attribute_kind_not_restricted_at_model_level(db):
     assert models.AttributeDefinition.objects.create(label='test', kind='somestring')

tests/test_user_name.py

@@ -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'

tests_authentic/test_user_name.py

@@ -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'

tox.ini

@@ -63,11 +63,11 @@ deps:
 	django-mellon
 	django-webtest
 	Markdown<3
-	authentic: https://git.entrouvert.org/authentic.git/snapshot/authentic-main.tar.gz
-	passerelle: https://git.entrouvert.org/passerelle.git/snapshot/passerelle-main.tar.gz
+	authentic: https://git.entrouvert.org/entrouvert/authentic/archive/main.tar.gz
+	passerelle: https://git.entrouvert.org/entrouvert/passerelle/archive/main.tar.gz
 	passerelle: python-memcached
 	multitenant: systemd-python
-	https://git.entrouvert.org/debian/django-tenant-schemas.git/snapshot/django-tenant-schemas-main.tar.gz
+	https://git.entrouvert.org/entrouvert/debian-django-tenant-schemas/archive/main.tar.gz
 	mock<4
 	httmock
 	requests