diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-01-17 05:03:42 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-01-17 05:03:42 +0000 |
| commit | a7c03e759d8c4fd0f7f29efdbcbf0f02deea757e (patch) | |
| tree | 1dbca99939c7c727b9b049a340254800e0b493cc /rpkid/rpki/gui/app | |
| parent | 039d45bbd00d3a5b36aa1397d7a0bdaacb5a061c (diff) | |
display name+ts in admin site Timestamp list
__unicode__ for Timestamp now displays both name and ts value
svn path=/branches/tk161/; revision=4174
Diffstat (limited to 'rpkid/rpki/gui/app')
| -rw-r--r-- | rpkid/rpki/gui/app/admin.py | 1 | ||||
| -rw-r--r-- | rpkid/rpki/gui/app/models.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rpkid/rpki/gui/app/admin.py b/rpkid/rpki/gui/app/admin.py index 4d801aa7..dada955c 100644 --- a/rpkid/rpki/gui/app/admin.py +++ b/rpkid/rpki/gui/app/admin.py @@ -50,6 +50,7 @@ class GhostbusterAdmin(admin.ModelAdmin): pass class TimestampAdmin(admin.ModelAdmin): + list_display = ('name', 'ts') pass admin.site.register(models.AddressRange, AddressRangeAdmin) diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py index e6880428..d59cbb08 100644 --- a/rpkid/rpki/gui/app/models.py +++ b/rpkid/rpki/gui/app/models.py @@ -262,6 +262,6 @@ class Timestamp(models.Model): ts = models.DateTimeField(null=False, auto_now=True) def __unicode__(self): - return self.name + return '%s: %s' % (self.name, self.ts) # vim:sw=4 ts=8 expandtab |