NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 00:28:16 -06:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
root 2017-10-30 17:21:10 -05:00
parent 8f72287198
commit 916cb712d1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/forms.py
View File

@ -379,7 +379,7 @@ class RackReservationForm(BootstrapMixin, TenancyForm, forms.ModelForm):
class Meta: class Meta:
model = RackReservation model = RackReservation
fields = ['units', 'description', 'tenant_group', 'tenant'] fields = ['units', 'tenant_group', 'tenant', 'description']
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -410,7 +410,7 @@ class RackReservationFilterForm(BootstrapMixin, forms.Form):
null_option=(0, 'None') null_option=(0, 'None')
) )
tenant = FilterChoiceField( tenant = FilterChoiceField(
queryset=Tenant.objects.annotate(filter_count=Count('racks')), queryset=Tenant.objects.annotate(filter_count=Count('racks__reservations')),
to_field_name='slug', to_field_name='slug',
null_option=(0, 'None') null_option=(0, 'None')
) )

2
netbox/dcim/tables.py
View File

@ -245,8 +245,6 @@ class RackImportTable(BaseTable):
class RackReservationTable(BaseTable): class RackReservationTable(BaseTable):
pk = ToggleColumn() 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')]) tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
rack = tables.LinkColumn('dcim:rack', args=[Accessor('rack.pk')]) rack = tables.LinkColumn('dcim:rack', args=[Accessor('rack.pk')])
unit_list = tables.Column(orderable=False, verbose_name='Units') unit_list = tables.Column(orderable=False, verbose_name='Units')