From 8c776b3f5b3db865645e1df8aeffff0b3f630e73 Mon Sep 17 00:00:00 2001 From: Julia Luna Date: Sun, 19 Jun 2022 00:52:13 +0200 Subject: [PATCH] =?UTF-8?q?remove=20unnecessary=20bloat=E2=84=A2,=20bump?= =?UTF-8?q?=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...quashed_0002_alter_domain_name.py => 0001_initial.py} | 5 ++--- scopedsites/models.py | 9 --------- setup.py | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) rename scopedsites/migrations/{0001_initial_squashed_0002_alter_domain_name.py => 0001_initial.py} (65%) diff --git a/scopedsites/migrations/0001_initial_squashed_0002_alter_domain_name.py b/scopedsites/migrations/0001_initial.py similarity index 65% rename from scopedsites/migrations/0001_initial_squashed_0002_alter_domain_name.py rename to scopedsites/migrations/0001_initial.py index 584ad90..073b2cd 100644 --- a/scopedsites/migrations/0001_initial_squashed_0002_alter_domain_name.py +++ b/scopedsites/migrations/0001_initial.py @@ -1,11 +1,11 @@ -# Generated by Django 4.0.5 on 2022-06-18 21:58 +# Generated by Django 4.0.5 on 2022-06-18 22:51 from django.db import migrations, models class Migration(migrations.Migration): - replaces = [('scopedsites', '0001_initial'), ('scopedsites', '0002_alter_domain_name')] + initial = True dependencies = [ ] @@ -16,7 +16,6 @@ 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(blank=True, max_length=255, verbose_name='display name')), ], ), ] diff --git a/scopedsites/models.py b/scopedsites/models.py index 1f3d2b6..c4018a6 100644 --- a/scopedsites/models.py +++ b/scopedsites/models.py @@ -10,15 +10,6 @@ class Domain(models.Model): unique=True, ) - 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 diff --git a/setup.py b/setup.py index 47474ea..debea3d 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup setup( name="django_scopedsites", packages=["scopedsites", "scopedsites.migrations"], - version="0.1.3", + version="0.1.4", description="django_scopes x django.contrib.sites", python_requires=">=3.6", install_requires=[