diff options
Diffstat (limited to 'rpki/gui/models.py')
| -rw-r--r-- | rpki/gui/models.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/rpki/gui/models.py b/rpki/gui/models.py index 184383c0..ced14926 100644 --- a/rpki/gui/models.py +++ b/rpki/gui/models.py @@ -22,7 +22,6 @@ from django.db import models import rpki.resource_set import rpki.POW -from south.modelsinspector import add_introspection_rules class IPv6AddressField(models.Field): @@ -42,8 +41,8 @@ class IPv6AddressField(models.Field): """ Note that we add a custom conversion to encode long values as hex strings in SQL statements. See settings.get_conv() for details. - """ + return value.toBytes() @@ -63,14 +62,6 @@ class IPv4AddressField(models.Field): def get_db_prep_value(self, value, connection, prepared): return long(value) -add_introspection_rules( - [ - ([IPv4AddressField, IPv6AddressField], [], {}) - ], - [r'^rpki\.gui\.models\.IPv4AddressField', - r'^rpki\.gui\.models\.IPv6AddressField'] -) - class Prefix(models.Model): """Common implementation for models with an IP address range. @@ -82,6 +73,7 @@ class Prefix(models.Model): """ Returns the prefix as a rpki.resource_set.resource_range_ip object. """ + return self.range_cls(self.prefix_min, self.prefix_max) @property @@ -96,6 +88,7 @@ class Prefix(models.Model): def __unicode__(self): """This method may be overridden by subclasses. The default implementation calls get_prefix_display(). """ + return self.get_prefix_display() class Meta: |