From 7e78372f351c4d1ab8fe345259da157414c3e217 Mon Sep 17 00:00:00 2001 From: Alex Gittings Date: Tue, 3 May 2022 11:04:08 +0000 Subject: [PATCH] fix bugs --- netbox/dcim/forms/models.py | 6 ------ netbox/dcim/tables/devices.py | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/forms/models.py b/netbox/dcim/forms/models.py index e070d18ee..136a31f5a 100644 --- a/netbox/dcim/forms/models.py +++ b/netbox/dcim/forms/models.py @@ -618,12 +618,6 @@ class DeviceAssignForm(BootstrapMixin, forms.Form): ) -class CableForm(TenancyForm, CustomFieldModelForm): - tags = DynamicModelMultipleChoiceField( - queryset=Tag.objects.all(), - required=False - - class ModuleForm(NetBoxModelForm): device = DynamicModelChoiceField( queryset=Device.objects.all(), diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 1e6c9e2e2..36398c9df 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -212,19 +212,19 @@ class DeviceTable(NetBoxTable): ) -class DeviceAssignTable(BaseTable): +class DeviceAssignTable(NetBoxTable): name = tables.TemplateColumn( template_code=DEVICE_ASSIGN_LINK, verbose_name='Name' ) - status = ChoiceFieldColumn() + status = columns.ChoiceFieldColumn() tenant = tables.TemplateColumn( template_code=DEVICE_ASSIGN_TENANT ) site = tables.Column() location = tables.Column() rack = tables.Column() - device_role = ColoredLabelColumn( + device_role = columns.ColoredLabelColumn( verbose_name='Role' ) manufacturer = tables.Column( @@ -238,7 +238,7 @@ class DeviceAssignTable(BaseTable): verbose_name='IP Address' ) - class Meta(BaseTable.Meta): + class Meta(NetBoxTable.Meta): model = Device fields = ( 'name', 'status', 'tenant', 'site', 'location', 'rack', 'device_role', 'manufacturer', 'device_type',