From 24ff722ffd5dc8f8671e0bfbb6f9672f4b62df5c Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 8 May 2024 10:58:38 -0500 Subject: [PATCH] Fix row highlighting --- netbox/dcim/tables/devices.py | 30 +++++++++++++++---- .../virtualization/tables/virtualmachines.py | 2 ++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 169631506..ad9caa03c 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -390,7 +390,10 @@ class DeviceConsolePortTable(ConsolePortTable): ) default_columns = ('pk', 'name', 'label', 'type', 'speed', 'description', 'cable', 'connection') row_attrs = { - 'class': get_cabletermination_row_class + 'data-name': lambda record: record.name, + 'data-mark-connected': lambda record: "true" if record.mark_connected else "false", + 'data-cable-status': lambda record: record.cable.status if record.cable else "", + 'data-type': lambda record: record.type } @@ -435,7 +438,10 @@ class DeviceConsoleServerPortTable(ConsoleServerPortTable): ) default_columns = ('pk', 'name', 'label', 'type', 'speed', 'description', 'cable', 'connection') row_attrs = { - 'class': get_cabletermination_row_class + 'data-name': lambda record: record.name, + 'data-mark-connected': lambda record: "true" if record.mark_connected else "false", + 'data-cable-status': lambda record: record.cable.status if record.cable else "", + 'data-type': lambda record: record.type } @@ -489,7 +495,10 @@ class DevicePowerPortTable(PowerPortTable): 'pk', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description', 'cable', 'connection', ) row_attrs = { - 'class': get_cabletermination_row_class + 'data-name': lambda record: record.name, + 'data-mark-connected': lambda record: "true" if record.mark_connected else "false", + 'data-cable-status': lambda record: record.cable.status if record.cable else "", + 'data-type': lambda record: record.type } @@ -540,7 +549,10 @@ class DevicePowerOutletTable(PowerOutletTable): 'pk', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description', 'cable', 'connection', ) row_attrs = { - 'class': get_cabletermination_row_class + 'data-name': lambda record: record.name, + 'data-mark-connected': lambda record: "true" if record.mark_connected else "false", + 'data-cable-status': lambda record: record.cable.status if record.cable else "", + 'data-type': lambda record: record.type } @@ -743,7 +755,10 @@ class DeviceFrontPortTable(FrontPortTable): 'pk', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description', 'cable', 'link_peer', ) row_attrs = { - 'class': get_cabletermination_row_class + 'data-name': lambda record: record.name, + 'data-mark-connected': lambda record: "true" if record.mark_connected else "false", + 'data-cable-status': lambda record: record.cable.status if record.cable else "", + 'data-type': lambda record: record.type } @@ -793,7 +808,10 @@ class DeviceRearPortTable(RearPortTable): 'pk', 'name', 'label', 'type', 'positions', 'description', 'cable', 'link_peer', ) row_attrs = { - 'class': get_cabletermination_row_class + 'data-name': lambda record: record.name, + 'data-mark-connected': lambda record: "true" if record.mark_connected else "false", + 'data-cable-status': lambda record: record.cable.status if record.cable else "", + 'data-type': lambda record: record.type } diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index ba5360a62..33aa05ca3 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -173,6 +173,8 @@ class VirtualMachineVMInterfaceTable(VMInterfaceTable): default_columns = ('pk', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'ip_addresses') row_attrs = { 'data-name': lambda record: record.name, + 'data-virtual': lambda record: "true" if record.is_virtual else "false", + 'data-mark-connected': lambda record: "true" if record.mark_connected else "false", }