NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 20:12:00 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Clean up display_name for various models

Browse Source
This commit is contained in:
Jeremy Stretch 2020-08-14 10:20:34 -04:00
parent 808d621eda
commit 66c91484f5
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
netbox/dcim/models/__init__.py
View File

@ -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):

6
netbox/ipam/models.py
View File

@ -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]