diff options
author | Michael Elkins <melkins@tislabs.com> | 2010-07-04 05:05:20 +0000 |
---|---|---|
committer | Michael Elkins <melkins@tislabs.com> | 2010-07-04 05:05:20 +0000 |
commit | bfcc253383fa1ee4ba9d35759e6bbfc1b2c1597b (patch) | |
tree | d96fb48054da97b8d1d9d10999de4385f39ac886 /portal-gui/rpkigui/myrpki/models.py | |
parent | dcea98e07c74de89afaa89f9ec019714daeff043 (diff) |
pretty print address ranges in cidr when possible
svn path=/portal-gui/rpkigui/myrpki/misc.py; revision=3329
Diffstat (limited to 'portal-gui/rpkigui/myrpki/models.py')
-rw-r--r-- | portal-gui/rpkigui/myrpki/models.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/portal-gui/rpkigui/myrpki/models.py b/portal-gui/rpkigui/myrpki/models.py index 329cd641..7823b9ff 100644 --- a/portal-gui/rpkigui/myrpki/models.py +++ b/portal-gui/rpkigui/myrpki/models.py @@ -2,6 +2,8 @@ from django.db import models from django.contrib.auth.models import User +from rpkigui.myrpki.misc import str_to_range +import rpki.resource_set class HandleField(models.CharField): def __init__(self, **kwargs): @@ -42,7 +44,8 @@ class AddressRange(models.Model): if self.lo == self.hi: return u"%s" % (self.lo,) else: - return u"%s - %s" % (self.lo, self.hi) + # pretty print cidr + return unicode(str_to_range(self.lo, self.hi)) def get_absolute_url(self): return u'/myrpki/address/%d' % (self.pk,) |