Просмотр исходного кода

Add the `label` to the string representation

Jonathan Senecal 5 лет назад
Родитель
Сommit
e21cbf2a06
2 измененных файлов с 16 добавлено и 0 удалено
  1. 8 0
      netbox/dcim/models/device_component_templates.py
  2. 8 0
      netbox/dcim/models/device_components.py

+ 8 - 0
netbox/dcim/models/device_component_templates.py

@@ -85,6 +85,8 @@ class ConsolePortTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
         unique_together = ('device_type', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def instantiate(self, device):
     def instantiate(self, device):
@@ -128,6 +130,8 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
         unique_together = ('device_type', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def instantiate(self, device):
     def instantiate(self, device):
@@ -183,6 +187,8 @@ class PowerPortTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
         unique_together = ('device_type', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def instantiate(self, device):
     def instantiate(self, device):
@@ -241,6 +247,8 @@ class PowerOutletTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
         unique_together = ('device_type', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def clean(self):
     def clean(self):

+ 8 - 0
netbox/dcim/models/device_components.py

@@ -267,6 +267,8 @@ class ConsolePort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
         unique_together = ('device', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def get_absolute_url(self):
     def get_absolute_url(self):
@@ -327,6 +329,8 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
         unique_together = ('device', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def get_absolute_url(self):
     def get_absolute_url(self):
@@ -413,6 +417,8 @@ class PowerPort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
         unique_together = ('device', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def get_absolute_url(self):
     def get_absolute_url(self):
@@ -568,6 +574,8 @@ class PowerOutlet(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
         unique_together = ('device', 'name')
 
 
     def __str__(self):
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
         return self.name
 
 
     def get_absolute_url(self):
     def get_absolute_url(self):