summaryrefslogtreecommitdiff
path: root/mirrors/models.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 20:28:49 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 20:28:49 -0500
commit16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (patch)
tree0dc941580251a06870b9ceee159b7685c8a02795 /mirrors/models.py
parentf9ae4f860ccf57e84032d7be9426331a9e06e979 (diff)
parentfbbcc8534a25d3e78ef3a319c8aeb127bc5085f0 (diff)
Merge tag 'release_2012-04-26'parabolaweb-2012-12-12
CSS and display related tweaks Conflicts: public/views.py requirements.txt requirements_prod.txt templates/public/download.html
Diffstat (limited to 'mirrors/models.py')
-rw-r--r--mirrors/models.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/mirrors/models.py b/mirrors/models.py
index 86905eea..19437610 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -3,15 +3,8 @@ from urlparse import urlparse
from django.db import models
from django.core.exceptions import ValidationError
+from django_countries import CountryField
-class NullCharField(models.CharField):
- description = "String (up to %(max_length)s), NULL if value is empty"
- _south_introspects = True
-
- def get_prep_value(self, value):
- if value == '':
- return None
- return self.to_python(value)
TIER_CHOICES = (
(0, 'Tier 0'),
@@ -20,11 +13,12 @@ TIER_CHOICES = (
(-1, 'Untiered'),
)
+
class Mirror(models.Model):
name = models.CharField(max_length=255, unique=True)
tier = models.SmallIntegerField(default=2, choices=TIER_CHOICES)
upstream = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
- country = models.CharField(max_length=255, db_index=True)
+ country = CountryField(blank=True, db_index=True)
admin_email = models.EmailField(max_length=255, blank=True)
public = models.BooleanField(default=True)
active = models.BooleanField(default=True)
@@ -68,8 +62,7 @@ class MirrorUrl(models.Model):
protocol = models.ForeignKey(MirrorProtocol, related_name="urls",
editable=False, on_delete=models.PROTECT)
mirror = models.ForeignKey(Mirror, related_name="urls")
- country = NullCharField(max_length=255, null=True, blank=True,
- db_index=True)
+ country = CountryField(blank=True, db_index=True)
has_ipv4 = models.BooleanField("IPv4 capable", default=True,
editable=False)
has_ipv6 = models.BooleanField("IPv6 capable", default=False,