diff --git a/scopedsites/migrations/0001_initial.py b/scopedsites/migrations/0001_initial_squashed_0002_alter_domain_name.py similarity index 65% rename from scopedsites/migrations/0001_initial.py rename to scopedsites/migrations/0001_initial_squashed_0002_alter_domain_name.py index cc13273..584ad90 100644 --- a/scopedsites/migrations/0001_initial.py +++ b/scopedsites/migrations/0001_initial_squashed_0002_alter_domain_name.py @@ -1,11 +1,11 @@ -# Generated by Django 4.0.5 on 2022-06-18 17:20 +# Generated by Django 4.0.5 on 2022-06-18 21:58 from django.db import migrations, models class Migration(migrations.Migration): - initial = True + replaces = [('scopedsites', '0001_initial'), ('scopedsites', '0002_alter_domain_name')] dependencies = [ ] @@ -16,7 +16,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('fqdn', models.CharField(max_length=255, unique=True, verbose_name='FQDN')), - ('name', models.CharField(max_length=255, verbose_name='display name')), + ('name', models.CharField(blank=True, max_length=255, verbose_name='display name')), ], ), ] diff --git a/scopedsites/models.py b/scopedsites/models.py index 3dbfc20..1f3d2b6 100644 --- a/scopedsites/models.py +++ b/scopedsites/models.py @@ -13,8 +13,12 @@ class Domain(models.Model): name = models.CharField( _('display name'), max_length=255, + blank=True, ) @classmethod def get_from_request(cls, request): return get_object_or_404(cls, fqdn__iexact=request.META.get('HTTP_HOST', '')) + + def get_name(self): + return self.name or self.fqdn