diff options
| -rw-r--r-- | rpkid/rpki/gui/app/admin.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/gui/app/models.py | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/rpkid/rpki/gui/app/admin.py b/rpkid/rpki/gui/app/admin.py index f4134214..8d2b7824 100644 --- a/rpkid/rpki/gui/app/admin.py +++ b/rpkid/rpki/gui/app/admin.py @@ -27,9 +27,11 @@ class ChildAdmin( admin.ModelAdmin ): pass class AddressRangeAdmin( admin.ModelAdmin ): + #list_display = ('__unicode__', 'lo', 'hi') pass class AsnAdmin( admin.ModelAdmin ): + #list_display = ('__unicode__',) pass class ParentAdmin( admin.ModelAdmin ): diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py index 43714682..78327b8f 100644 --- a/rpkid/rpki/gui/app/models.py +++ b/rpkid/rpki/gui/app/models.py @@ -57,6 +57,9 @@ class AddressRange(models.Model): allocated = models.ForeignKey('Child', related_name='address_range', blank=True, null=True) + class Meta: + ordering = ['lo', 'hi'] + def __unicode__(self): if self.lo == self.hi: return u"%s" % (self.lo,) @@ -71,6 +74,8 @@ class AddressRange(models.Model): print err return u'%s - %s' % (self.lo, self.hi) + #__unicode__.admin_order_field = 'lo' + @models.permalink def get_absolute_url(self): return ('rpki.gui.app.views.address_view', [str(self.pk)]) @@ -123,12 +128,17 @@ class Asn(models.Model): allocated = models.ForeignKey('Child', related_name='asn', blank=True, null=True) + class Meta: + ordering = ['lo', 'hi'] + def __unicode__(self): if self.lo == self.hi: return u"ASN %d" % (self.lo,) else: return u"ASNs %d - %d" % (self.lo, self.hi) + #__unicode__.admin_order_field = 'lo' + @models.permalink def get_absolute_url(self): return ('rpki.gui.app.views.asn_view', [str(self.pk)]) |