diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py index 2803bb8de..1caad296f 100644 --- a/netbox/dcim/models/__init__.py +++ b/netbox/dcim/models/__init__.py @@ -648,10 +648,8 @@ class Rack(ChangeLoggedModel, CustomFieldModel): @property def display_name(self): if self.facility_id: - return "{} ({})".format(self.name, self.facility_id) - elif self.name: - return self.name - return "" + return f'{self.name} ({self.facility_id})' + return self.name def get_status_class(self): return self.STATUS_CLASS_MAP.get(self.status) @@ -1216,7 +1214,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel): @property def display_name(self): - return '{} {}'.format(self.manufacturer.name, self.model) + return f'{self.manufacturer.name} {self.model}' @property def is_parent_device(self): @@ -1712,11 +1710,12 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): def display_name(self): if self.name: return self.name - elif self.virtual_chassis and self.virtual_chassis.master.name: - return "{}:{}".format(self.virtual_chassis.master, self.vc_position) - elif hasattr(self, 'device_type'): - return "{}".format(self.device_type) - return "" + elif self.virtual_chassis: + return f'{self.virtual_chassis.name}:{self.vc_position} ({self.pk})' + elif self.device_type: + return f'{self.device_type.manufacturer} {self.device_type.model} ({self.pk})' + else: + return '' # Device has not yet been created @property def identifier(self): diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index b6abe3f2d..58dd96089 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -107,7 +107,7 @@ class VRF(ChangeLoggedModel, CustomFieldModel): @property def display_name(self): if self.rd: - return "{} ({})".format(self.name, self.rd) + return f'{self.name} ({self.rd})' return self.name @@ -985,9 +985,7 @@ class VLAN(ChangeLoggedModel, CustomFieldModel): @property def display_name(self): - if self.vid and self.name: - return "{} ({})".format(self.vid, self.name) - return None + return f'{self.name} ({self.vid})' def get_status_class(self): return self.STATUS_CLASS_MAP[self.status]