From ddfdf613423fedc3650a5eee577ad83f3ae75fd5 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 16 Nov 2022 09:57:02 -0500 Subject: [PATCH] Simplify termination color resolution --- netbox/dcim/models/device_components.py | 6 ------ netbox/dcim/svg/cables.py | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 2ca9af797..8f1285901 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -902,9 +902,6 @@ class FrontPort(ModularComponentModel, CabledObjectModel): ('rear_port', 'rear_port_position'), ) - def get_color(self): - return self.color - def get_absolute_url(self): return reverse('dcim:frontport', kwargs={'pk': self.pk}) @@ -951,9 +948,6 @@ class RearPort(ModularComponentModel, CabledObjectModel): ordering = ('device', '_name') unique_together = ('device', 'name') - def get_color(self): - return self.color - def get_absolute_url(self): return reverse('dcim:rearport', kwargs={'pk': self.pk}) diff --git a/netbox/dcim/svg/cables.py b/netbox/dcim/svg/cables.py index cc1306565..33adef798 100644 --- a/netbox/dcim/svg/cables.py +++ b/netbox/dcim/svg/cables.py @@ -166,9 +166,7 @@ class CableTraceSVG: """ if hasattr(instance, 'parent_object'): # Termination - if(hasattr(instance, 'get_color') and instance.get_color()): - return instance.get_color() - return 'f0f0f0' + return getattr(instance, 'color', 'f0f0f0') or 'f0f0f0' if hasattr(instance, 'device_role'): # Device return instance.device_role.color