diff options
| author | Michael Elkins <melkins@tislabs.com> | 2010-07-04 17:41:59 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2010-07-04 17:41:59 +0000 |
| commit | f7ca5371c12c893d8417d63cae6525d28d067c36 (patch) | |
| tree | fe9c4ddb40591867fe1191b566187551c456444d | |
| parent | 60cf2b285c35807ae68ad8fe5b9013dd31b84c6f (diff) | |
gracefully handle printing address range with hi and lo swapped
svn path=/portal-gui/rpkigui/myrpki/models.py; revision=3334
| -rw-r--r-- | portal-gui/rpkigui/myrpki/models.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/portal-gui/rpkigui/myrpki/models.py b/portal-gui/rpkigui/myrpki/models.py index 7823b9ff..551508d2 100644 --- a/portal-gui/rpkigui/myrpki/models.py +++ b/portal-gui/rpkigui/myrpki/models.py @@ -43,9 +43,12 @@ class AddressRange(models.Model): def __unicode__(self): if self.lo == self.hi: return u"%s" % (self.lo,) - else: + + try: # pretty print cidr return unicode(str_to_range(self.lo, self.hi)) + except socket.error: + return u'%s - %s' % (self.lo, self.hi) def get_absolute_url(self): return u'/myrpki/address/%d' % (self.pk,) @@ -65,7 +68,7 @@ class Asn(models.Model): if self.lo == self.hi: return u"ASN %d" % (self.lo,) else: - return u"ASNs %d-%d" % (self.lo, self.hi) + return u"ASNs %d - %d" % (self.lo, self.hi) def get_absolute_url(self): return u'/myrpki/asn/%d' % (self.pk,) |