diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
commit | ea00a099dffd7157c93af54b5817734348d2bbc6 (patch) | |
tree | 89fa4ba0c0ac19a4286ba4c4cb64f77536b1a098 /mirrors/models.py | |
parent | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff) | |
parent | 0f0ce18109f8104d7b2abe9024ef26fa07ff0292 (diff) |
Merge branch 'archweb' into archweb-generic
Conflicts:
templates/public/download.html
templates/public/index.html
Diffstat (limited to 'mirrors/models.py')
-rw-r--r-- | mirrors/models.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/mirrors/models.py b/mirrors/models.py index 0b053043..641a6b97 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -32,6 +32,7 @@ class Mirror(models.Model): bug = models.PositiveIntegerField("Flyspray bug", null=True, blank=True) notes = models.TextField(blank=True) created = models.DateTimeField(editable=False) + last_modified = models.DateTimeField(editable=False) class Meta: ordering = ('name',) @@ -74,6 +75,12 @@ class MirrorUrl(models.Model): created = models.DateTimeField(editable=False) active = models.BooleanField(default=True) + class Meta: + verbose_name = 'mirror URL' + + def __unicode__(self): + return self.url + def address_families(self): hostname = urlparse(self.url).hostname info = socket.getaddrinfo(hostname, None, 0, socket.SOCK_STREAM) @@ -100,11 +107,8 @@ class MirrorUrl(models.Model): self.has_ipv4 = False self.has_ipv6 = False - def __unicode__(self): - return self.url - - class Meta: - verbose_name = 'mirror URL' + def get_absolute_url(self): + return '/mirrors/%s/%d/' % (self.mirror.name, self.pk) class MirrorRsync(models.Model): @@ -114,7 +118,7 @@ class MirrorRsync(models.Model): created = models.DateTimeField(editable=False) def __unicode__(self): - return self.ip + return unicode(self.ip) class Meta: verbose_name = 'mirror rsync IP' @@ -123,7 +127,7 @@ class MirrorRsync(models.Model): class CheckLocation(models.Model): hostname = models.CharField(max_length=255) - source_ip = models.GenericIPAddressField(verbose_name='source IP', + source_ip = models.GenericIPAddressField('source IP', unpack_ipv4=True, unique=True) country = CountryField() created = models.DateTimeField(editable=False) |