fix: lengthening display name

common/djangoapps/third_party_auth/migrations/0006_auto_20220314_1551.py

@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='samlproviderconfig',
             name='display_name',
-            field=models.CharField(blank=True, help_text='A configuration nickname.', max_length=30),
+            field=models.CharField(blank=True, help_text='A configuration nickname.', max_length=35),
         ),
         migrations.AlterField(
             model_name='ltiproviderconfig',

common/djangoapps/third_party_auth/models.py

@@ -572,7 +572,7 @@ class SAMLProviderConfig(ProviderConfig):
     """
     prefix = 'saml'
     display_name = models.CharField(
-        max_length=30, blank=True,
+        max_length=35, blank=True,
         help_text=_("A configuration nickname."))
     backend_name = models.CharField(
         max_length=50, default='tpa-saml', blank=True,

common/djangoapps/third_party_auth/samlproviderconfig/tests/test_samlproviderconfig.py

@@ -33,6 +33,7 @@ SINGLE_PROVIDER_CONFIG = {
 SINGLE_PROVIDER_CONFIG_2 = copy.copy(SINGLE_PROVIDER_CONFIG)
 SINGLE_PROVIDER_CONFIG_2['name'] = 'name-of-config-2'
 SINGLE_PROVIDER_CONFIG_2['slug'] = 'test-slug-2'
+SINGLE_PROVIDER_CONFIG_2['display_name'] = 'display-name'
 
 SINGLE_PROVIDER_CONFIG_3 = copy.copy(SINGLE_PROVIDER_CONFIG)
 SINGLE_PROVIDER_CONFIG_3['name'] = 'name-of-config-3'
@@ -97,7 +98,7 @@ class SAMLProviderConfigTests(APITestCase):
         assert results[0]['entity_id'] == SINGLE_PROVIDER_CONFIG['entity_id']
         assert results[0]['metadata_source'] == SINGLE_PROVIDER_CONFIG['metadata_source']
         assert response.data['results'][0]['country'] == SINGLE_PROVIDER_CONFIG['country']
-        assert re.match(r"saml-test-slug-\d{4}", results[0]['display_name'])
+        assert re.match(r"test-slug-\d{4}", results[0]['display_name'])
         assert SAMLProviderConfig.objects.count() == 1
 
     def test_get_one_config_by_enterprise_uuid_invalid_uuid(self):
@@ -149,6 +150,7 @@ class SAMLProviderConfigTests(APITestCase):
         assert provider_config.name == 'name-of-config-2'
         assert provider_config.country == SINGLE_PROVIDER_CONFIG_2['country']
         assert provider_config.attr_username == SINGLE_PROVIDER_CONFIG['attr_first_name']
+        assert provider_config.display_name == SINGLE_PROVIDER_CONFIG_2['display_name']
 
         # check association has also been created
         assert EnterpriseCustomerIdentityProvider.objects.filter(

lms/djangoapps/program_enrollments/signals.py

@@ -4,7 +4,7 @@ Signal handlers for program enrollments
 
 
 import logging
-import datetime
+from datetime import datetime
 
 from django.db.models.signals import pre_save, post_save
 from django.dispatch import receiver
@@ -49,8 +49,8 @@ def generate_default_display_name(self):
     """
     Returns a default display name for SamlProviderConfig.
     """
-    t = datetime.datetime.now()
-    return f'{self.prefix}-{self.slug}-{t.minute}{t.second}'
+    time = datetime.now().strftime('%M%S')
+    return f'{self.slug}-{time}'
 
 
 @receiver(pre_save, sender=SAMLProviderConfig)