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

Fixes #8374 - Display device type and asset tag if name is blank but asset tag is populated

Daniel Sheppard 3 лет назад
Родитель
Сommit
f415d81049
2 измененных файлов с 5 добавлено и 0 удалено
  1. 1 0
      docs/release-notes/version-3.2.md
  2. 4 0
      netbox/dcim/models/devices.py

+ 1 - 0
docs/release-notes/version-3.2.md

@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+* [#8374](https://github.com/netbox-community/netbox/issues/8374) - Display device type and asset tag if name is blank but asset tag is populated
 * [#8922](https://github.com/netbox-community/netbox/issues/8922) - Add service list to IP address view
 
 ### Bug Fixes

+ 4 - 0
netbox/dcim/models/devices.py

@@ -748,8 +748,12 @@ class Device(NetBoxModel, ConfigContextModel):
             return f'{self.name} ({self.asset_tag})'
         elif self.name:
             return self.name
+        elif self.virtual_chassis and self.asset_tag:
+            return f'{self.virtual_chassis.name}:{self.vc_position} ({self.asset_tag})'
         elif self.virtual_chassis:
             return f'{self.virtual_chassis.name}:{self.vc_position} ({self.pk})'
+        elif self.device_type and self.asset_tag:
+            return f'{self.device_type.manufacturer} {self.device_type.model} ({self.asset_tag})'
         elif self.device_type:
             return f'{self.device_type.manufacturer} {self.device_type.model} ({self.pk})'
         return super().__str__()