From 658a0acfa9d2b4e4cb4aaa347c5986e56effffa6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 21 Jun 2016 15:06:26 -0400 Subject: [PATCH] Moved 'display_name' from serializer to model --- netbox/dcim/api/serializers.py | 4 ---- netbox/dcim/models.py | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index be60d3ba0..25a2e467d 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -50,7 +50,6 @@ class RackGroupNestedSerializer(SiteSerializer): class RackSerializer(serializers.ModelSerializer): - display_name = serializers.SerializerMethodField() site = SiteNestedSerializer() group = RackGroupNestedSerializer() @@ -58,9 +57,6 @@ class RackSerializer(serializers.ModelSerializer): model = Rack fields = ['id', 'name', 'facility_id', 'display_name', 'site', 'group', 'u_height', 'comments'] - def get_display_name(self, obj): - return str(obj) - class RackNestedSerializer(RackSerializer): diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index d019f08f3..9042955c8 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -177,8 +177,6 @@ class Rack(models.Model): ] def __unicode__(self): - if self.facility_id: - return "{} ({})".format(self.name, self.facility_id) return self.name def get_absolute_url(self): @@ -197,6 +195,12 @@ class Rack(models.Model): def units(self): return reversed(range(1, self.u_height + 1)) + @property + def display_name(self): + if self.facility_id: + return "{} ({})".format(self.name, self.facility_id) + return self.name + def get_rack_units(self, face=RACK_FACE_FRONT, remove_redundant=False): """ Return a list of rack units as dictionaries. Example: {'device': None, 'face': 0, 'id': 48, 'name': 'U48'}