From 4c45e38aeada3e59ea8199873101fc42523b4ff3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 12 Jul 2016 10:45:07 -0400 Subject: [PATCH] Fixes #162: Return Unicode from display_name() --- netbox/dcim/models.py | 6 +++--- netbox/ipam/models.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 68c485b40..df07fa748 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -263,7 +263,7 @@ class Rack(CreatedUpdatedModel): @property def display_name(self): if self.facility_id: - return "{} ({})".format(self.name, self.facility_id) + return u"{} ({})".format(self.name, self.facility_id) return self.name def get_rack_units(self, face=RACK_FACE_FRONT, exclude=None, remove_redundant=False): @@ -698,9 +698,9 @@ class Device(CreatedUpdatedModel): if self.name: return self.name 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: - return "{} ({})".format(self.device_type, self.rack.name) + return u"{} ({})".format(self.device_type, self.rack.name) @property def identifier(self): diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 79873f549..402e02330 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -375,7 +375,7 @@ class VLAN(CreatedUpdatedModel): @property def display_name(self): - return "{} ({})".format(self.vid, self.name) + return u"{} ({})".format(self.vid, self.name) def get_status_class(self): return STATUS_CHOICE_CLASSES[self.status]