environment: initialize title from slug on save (#73207)
To simplify tests, slug is always globally unique for the model, using it for title will always work.
This commit is contained in:
parent
ea8a633d29
commit
645d6566f1
|
@ -225,6 +225,9 @@ class ServiceBase(models.Model):
|
||||||
else:
|
else:
|
||||||
self.secret_key = get_random_string(50, SECRET_CHARS)
|
self.secret_key = get_random_string(50, SECRET_CHARS)
|
||||||
|
|
||||||
|
if not self.title and self.slug:
|
||||||
|
self.title = self.slug
|
||||||
|
|
||||||
is_new = self.id is None
|
is_new = self.id is None
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
|
@ -231,12 +231,18 @@ def test_get_variable_value():
|
||||||
|
|
||||||
|
|
||||||
def test_get_tenant_name_and_public_urls():
|
def test_get_tenant_name_and_public_urls():
|
||||||
Combo.objects.create(base_url='https://combo.dev.publik.love', template_name='...portal-user...')
|
Combo.objects.create(
|
||||||
Combo.objects.create(base_url='https://agent-combo.dev.publik.love', template_name='...portal-agent...')
|
slug='portal', base_url='https://combo.dev.publik.love', template_name='...portal-user...'
|
||||||
Combo.objects.create(base_url='https://no-template-combo.dev.publik.love')
|
)
|
||||||
Wcs.objects.create(base_url='https://wcs.dev.publik.love')
|
Combo.objects.create(
|
||||||
Fargo.objects.create(base_url='https://fargo.dev.publik.love')
|
slug='portal-agent',
|
||||||
Hobo.objects.create(base_url='https://hobo.dev.publik.love')
|
base_url='https://agent-combo.dev.publik.love',
|
||||||
|
template_name='...portal-agent...',
|
||||||
|
)
|
||||||
|
Combo.objects.create(slug='portal-no-template', base_url='https://no-template-combo.dev.publik.love')
|
||||||
|
Wcs.objects.create(slug='wcs', base_url='https://wcs.dev.publik.love')
|
||||||
|
Fargo.objects.create(slug='fargo', base_url='https://fargo.dev.publik.love')
|
||||||
|
Hobo.objects.create(slug='hobo', base_url='https://hobo.dev.publik.love')
|
||||||
tenant_name, site_urls = get_tenant_name_and_public_urls()
|
tenant_name, site_urls = get_tenant_name_and_public_urls()
|
||||||
assert tenant_name == 'combo.dev.publik.love'
|
assert tenant_name == 'combo.dev.publik.love'
|
||||||
assert site_urls == [
|
assert site_urls == [
|
||||||
|
|
Loading…
Reference in New Issue