From 945337177d35a5c038e29b6594e1251f26d42156 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 29 Mar 2014 11:56:29 -0500 Subject: Add last_modified column to mirrors This will make it easier in the future to clear out inactive mirrors that haven't been touched in a while. Signed-off-by: Dan McGee --- mirrors/models.py | 1 + 1 file changed, 1 insertion(+) (limited to 'mirrors/models.py') diff --git a/mirrors/models.py b/mirrors/models.py index 0b053043..41132229 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',) -- cgit v1.2.3-2-g168b From a8ceba34299cca271ddf433bf7618aa98e56cc36 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 1 Sep 2014 16:16:44 -0500 Subject: Add details link to mirror status page Signed-off-by: Dan McGee --- mirrors/models.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'mirrors/models.py') diff --git a/mirrors/models.py b/mirrors/models.py index 41132229..e360801b 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -75,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) @@ -101,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): -- cgit v1.2.3-2-g168b From 9d0db65025c229941d40e1d4f02f092c9d205723 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 23 Aug 2014 21:30:25 -0500 Subject: Fix up some IP address field issues Ensure we always coerce values to unicode in our __unicode__ method, and remove some now unneeded verbosity and comments since the upstream bug has been fixed. Signed-off-by: Dan McGee --- mirrors/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mirrors/models.py') diff --git a/mirrors/models.py b/mirrors/models.py index e360801b..641a6b97 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -118,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' @@ -127,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) -- cgit v1.2.3-2-g168b