From fc85d02261e2ca8193d1d4f9425b1ff217de7c93 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Mon, 29 Jul 2013 14:49:37 -0700 Subject: [PATCH] Add SliceNetworkInline --- planetstack/core/admin.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 10ddce4..d2b8923 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -165,11 +165,18 @@ class SliceMembershipInline(PlStackTabularInline): sites = [site_privilege.site for site_privilege in site_privileges] site_privileges = SitePrivilege.objects.filter(site__in=sites) emails = [site_privilege.user.email for site_privilege in site_privileges] - users = User.objects.filter(email__in=emails) + users = User.objects.filter(email__in=emails) kwargs['queryset'] = list(users) return super(SliceMembershipInline, self).formfield_for_foreignkey(db_field, request, **kwargs) +class SliceNetworkInline(admin.TabularInline): + # exclude = ['enacted'] + model = Network.slices.through + extra = 0 + verbose_name = "Connected Network" + verbose_name_plural = "Connected Networks" + class SliceTagInline(PlStackTabularInline): model = SliceTag extra = 0 @@ -317,21 +324,10 @@ class SitePrivilegeAdmin(PlanetStackBaseAdmin): qs = qs.filter(site__in=sites) return qs -class NetworkSliverInline(PlStackTabularInline): - model = NetworkSliver - extra = 0 - fields = ('network', 'ip') - - def get_queryset(self, request): - return NetworkSliver.objects.all() - - def formfield_for_foreignkey(self, db_field, request, **kwargs): - return super(NetworkSliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs) - class SliceAdmin(PlanetStackBaseAdmin): fields = ['name', 'site', 'serviceClass', 'description', 'slice_url'] list_display = ('name', 'site','serviceClass', 'slice_url') - inlines = [SliverInline, SliceMembershipInline, TagInline, SliceTagInline] #, NetworkSliverInline] + inlines = [SliverInline, SliceMembershipInline, TagInline, SliceTagInline, SliceNetworkInline] def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'site': -- 2.47.0