diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:01:52 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:01:52 -0300 |
commit | a8b2fc84ba96c83ec1addf89ac04608fbf572705 (patch) | |
tree | 6f54cbe43b8684908f2e80ba311272c06fd0fd08 /mirrors/models.py | |
parent | 294bf173236610fc8c308f81d8617e7e0d0e4bff (diff) | |
parent | b0bad20756549df5edf726771c8e6869caba6244 (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/base.html
Diffstat (limited to 'mirrors/models.py')
-rw-r--r-- | mirrors/models.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mirrors/models.py b/mirrors/models.py index bcde210c..4f70e5a9 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -1,8 +1,17 @@ +import socket +from urlparse import urlparse + from django.db import models from django.core.exceptions import ValidationError -import socket -from urlparse import urlparse +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'), @@ -58,7 +67,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 = models.CharField(max_length=255, blank=True, null=True, + country = NullCharField(max_length=255, null=True, blank=True, db_index=True) has_ipv4 = models.BooleanField("IPv4 capable", default=True, editable=False) |