diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 2e310530c..2d2c5e6f8 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -1153,10 +1153,6 @@ class InterfaceConnectionTable(BaseTable): args=[Accessor('pk')], verbose_name='Interface A' ) - description_a = tables.Column( - accessor=Accessor('description'), - verbose_name='Description' - ) device_b = tables.LinkColumn( viewname='dcim:device', accessor=Accessor('_connected_interface.device'), @@ -1169,15 +1165,11 @@ class InterfaceConnectionTable(BaseTable): args=[Accessor('_connected_interface.pk')], verbose_name='Interface B' ) - description_b = tables.Column( - accessor=Accessor('_connected_interface.description'), - verbose_name='Description' - ) class Meta(BaseTable.Meta): model = Interface fields = ( - 'device_a', 'interface_a', 'description_a', 'device_b', 'interface_b', 'description_b', 'connection_status', + 'device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status', ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index ce3a3d068..cd1b4edf4 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2278,19 +2278,15 @@ class InterfaceConnectionsListView(PermissionRequiredMixin, ObjectListView): csv_data = [ # Headers ','.join([ - 'device_a', 'interface_a', 'interface_a_description', - 'device_b', 'interface_b', 'interface_b_description', - 'connection_status' + 'device_a', 'interface_a', 'device_b', 'interface_b', 'connection_status' ]) ] for obj in self.queryset: csv = csv_format([ obj.connected_endpoint.device.identifier if obj.connected_endpoint else None, obj.connected_endpoint.name if obj.connected_endpoint else None, - obj.connected_endpoint.description if obj.connected_endpoint else None, obj.device.identifier, obj.name, - obj.description, obj.get_connection_status_display(), ]) csv_data.append(csv)