diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index b7f94a450..acb5f0d46 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -85,6 +85,8 @@ class ConsolePortTemplate(ComponentTemplateModel): unique_together = ('device_type', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def instantiate(self, device): @@ -128,6 +130,8 @@ class ConsoleServerPortTemplate(ComponentTemplateModel): unique_together = ('device_type', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def instantiate(self, device): @@ -183,6 +187,8 @@ class PowerPortTemplate(ComponentTemplateModel): unique_together = ('device_type', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def instantiate(self, device): @@ -241,6 +247,8 @@ class PowerOutletTemplate(ComponentTemplateModel): unique_together = ('device_type', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def clean(self): diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 860e1bd65..b8331365d 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -267,6 +267,8 @@ class ConsolePort(CableTermination, ComponentModel): unique_together = ('device', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def get_absolute_url(self): @@ -327,6 +329,8 @@ class ConsoleServerPort(CableTermination, ComponentModel): unique_together = ('device', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def get_absolute_url(self): @@ -413,6 +417,8 @@ class PowerPort(CableTermination, ComponentModel): unique_together = ('device', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def get_absolute_url(self): @@ -568,6 +574,8 @@ class PowerOutlet(CableTermination, ComponentModel): unique_together = ('device', 'name') def __str__(self): + if self.label: + return f"{self.name} ({self.label})" return self.name def get_absolute_url(self):