From 916cb712d187ba66e107e45fae068cb4681bac9a Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Oct 2017 17:21:10 -0500 Subject: [PATCH] cleanup --- netbox/dcim/forms.py | 4 ++-- netbox/dcim/tables.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 2527ab94b..3e75b65a9 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -379,7 +379,7 @@ class RackReservationForm(BootstrapMixin, TenancyForm, forms.ModelForm): class Meta: model = RackReservation - fields = ['units', 'description', 'tenant_group', 'tenant'] + fields = ['units', 'tenant_group', 'tenant', 'description'] def __init__(self, *args, **kwargs): @@ -410,7 +410,7 @@ class RackReservationFilterForm(BootstrapMixin, forms.Form): null_option=(0, 'None') ) tenant = FilterChoiceField( - queryset=Tenant.objects.annotate(filter_count=Count('racks')), + queryset=Tenant.objects.annotate(filter_count=Count('racks__reservations')), to_field_name='slug', null_option=(0, 'None') ) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 1ebc20435..3aea901d9 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -245,8 +245,6 @@ class RackImportTable(BaseTable): class RackReservationTable(BaseTable): pk = ToggleColumn() - site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')]) - group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group') tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')]) rack = tables.LinkColumn('dcim:rack', args=[Accessor('rack.pk')]) unit_list = tables.Column(orderable=False, verbose_name='Units')