diff --git a/binder/bcommon/admin.py b/binder/bcommon/admin.py index e7ae7d1..3b8cd80 100644 --- a/binder/bcommon/admin.py +++ b/binder/bcommon/admin.py @@ -1,12 +1,11 @@ -from bcommon.models import BindServer, Key, Zone +from bcommon.models import BindServer, Key from django.contrib import admin class ZoneAdmin(admin.ModelAdmin): - list_display = [ 'zone_name', 'server'] + list_display = [ 'zone_name', 'server', 'key' ] class KeyAdmin(admin.ModelAdmin): list_display = [ 'name', 'data' ] admin.site.register(BindServer) admin.site.register(Key, KeyAdmin) -admin.site.register(Zone, ZoneAdmin) diff --git a/binder/bcommon/models.py b/binder/bcommon/models.py index 4c5e23b..4c6248e 100644 --- a/binder/bcommon/models.py +++ b/binder/bcommon/models.py @@ -15,10 +15,3 @@ class Key(models.Model): def __unicode__(self): return self.name - -class Zone(models.Model): - server = models.ForeignKey('BindServer') - zone_name = models.CharField(max_length=50) - - def __unicode__(self): - return self.zone_name