summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorPiotr Jakimiak <pj306228@students.mimuw.edu.pl>2015-05-14 19:59:36 +0200
committerTim Graham <timograham@gmail.com>2015-05-16 08:43:42 -0400
commit70e3e2e08ee1d07343d48b1db9df838db3efb0e2 (patch)
tree2fe2e8536a198d666dcb4ef582f77d78d1d2c74b /django
parent4c2197db32deaea2f0c3d04c2c36bb7df6a2e06c (diff)
Fixed #24774 -- Made contrib.site's Site.domain field unique
Diffstat (limited to 'django')
-rw-r--r--django/contrib/sites/migrations/0002_alter_domain_unique.py20
-rw-r--r--django/contrib/sites/models.py2
2 files changed, 21 insertions, 1 deletions
diff --git a/django/contrib/sites/migrations/0002_alter_domain_unique.py b/django/contrib/sites/migrations/0002_alter_domain_unique.py
new file mode 100644
index 0000000000..e7f414fb5c
--- /dev/null
+++ b/django/contrib/sites/migrations/0002_alter_domain_unique.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import django.contrib.sites.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('sites', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='site',
+ name='domain',
+ field=models.CharField(max_length=100, unique=True, validators=[django.contrib.sites.models._simple_domain_name_validator], verbose_name='domain name'),
+ ),
+ ]
diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py
index d7026d0355..6471dca136 100644
--- a/django/contrib/sites/models.py
+++ b/django/contrib/sites/models.py
@@ -73,7 +73,7 @@ class SiteManager(models.Manager):
class Site(models.Model):
domain = models.CharField(_('domain name'), max_length=100,
- validators=[_simple_domain_name_validator])
+ validators=[_simple_domain_name_validator], unique=True)
name = models.CharField(_('display name'), max_length=50)
objects = SiteManager()