mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #162: Return Unicode from display_name()

Browse Source
This commit is contained in:
Jeremy Stretch
2016-07-12 10:45:07 -04:00
parent e1a6188580
commit 4c45e38aea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/models.py
View File

@ -263,7 +263,7 @@ class Rack(CreatedUpdatedModel):
@property @property
def display_name(self): def display_name(self):
if self.facility_id: if self.facility_id:
return "{} ({})".format(self.name, self.facility_id) return u"{} ({})".format(self.name, self.facility_id)
return self.name return self.name
def get_rack_units(self, face=RACK_FACE_FRONT, exclude=None, remove_redundant=False): def get_rack_units(self, face=RACK_FACE_FRONT, exclude=None, remove_redundant=False):
@ -698,9 +698,9 @@ class Device(CreatedUpdatedModel):
if self.name: if self.name:
return self.name return self.name
elif self.position: elif self.position:
return "{} ({} U{})".format(self.device_type, self.rack.name, self.position) return u"{} ({} U{})".format(self.device_type, self.rack.name, self.position)
else: else:
return "{} ({})".format(self.device_type, self.rack.name) return u"{} ({})".format(self.device_type, self.rack.name)
@property @property
def identifier(self): def identifier(self):

2
netbox/ipam/models.py
View File

@ -375,7 +375,7 @@ class VLAN(CreatedUpdatedModel):
@property @property
def display_name(self): def display_name(self):
return "{} ({})".format(self.vid, self.name) return u"{} ({})".format(self.vid, self.name)
def get_status_class(self): def get_status_class(self):
return STATUS_CHOICE_CLASSES[self.status] return STATUS_CHOICE_CLASSES[self.status]