display a table containing the full x.509 cert chain for all signed objects

in cert detail view, display validation status for all issued objects in tables

move name and key id fields to signedobject base class in order to store the SN and SKI of the signing EE certs

svn path=/rpkid/portal-gui/scripts/rpkigui-rcynic.py; revision=3875

1 files changed, 9 insertions, 9 deletions

diff --git a/rpkid/rpki/gui/cacheview/models.py b/rpkid/rpki/gui/cacheview/models.py
index afdd2c74..d68601fc 100644
--- a/rpkid/rpki/gui/cacheview/models.py
+++ b/rpkid/rpki/gui/cacheview/models.py
@@ -107,6 +107,12 @@ class SignedObject(models.Model):
 
     mtime      = models.PositiveIntegerField(default=0)
 
+    # SubjectName
+    name  = models.CharField(max_length=255)
+
+    # value from the SKI extension
+    keyid = models.CharField(max_length=50, db_index=True)
+
     # validity period from EE cert which signed object
     not_before = models.DateTimeField()
     not_after  = models.DateTimeField()
@@ -120,16 +126,13 @@ class SignedObject(models.Model):
         """
         return datetime.utcfromtimestamp(self.mtime + time.timezone)
 
+    def __unicode__(self):
+        return u'%s' % self.name
+
 class Cert(SignedObject):
     """
     Object representing a resource certificate.
     """
-    # SubjectName
-    name  = models.CharField(max_length=255)
-
-    # value from the SKI extension
-    keyid = models.CharField(max_length=50, db_index=True)
-
     addresses = models.ManyToManyField(AddressRange, related_name='certs')
     asns      = models.ManyToManyField(ASRange, related_name='certs')
     issuer    = models.ForeignKey('Cert', related_name='children', null=True, blank=True)
@@ -138,9 +141,6 @@ class Cert(SignedObject):
     def get_absolute_url(self):
         return ('rpki.gui.cacheview.views.cert_detail', [str(self.pk)])
 
-    def __unicode__(self):
-        return u'%s' % self.name
-
 class ROAPrefix(models.Model):
     family     = models.PositiveIntegerField()
     prefix     = models.IPAddressField()