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

Moved 'display_name' from serializer to model

Browse Source
This commit is contained in:
Jeremy Stretch
2016-06-21 15:06:26 -04:00
parent 72f62f949d
commit 658a0acfa9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/api/serializers.py
View File

@ -50,7 +50,6 @@ class RackGroupNestedSerializer(SiteSerializer):
class RackSerializer(serializers.ModelSerializer): class RackSerializer(serializers.ModelSerializer):
display_name = serializers.SerializerMethodField()
site = SiteNestedSerializer() site = SiteNestedSerializer()
group = RackGroupNestedSerializer() group = RackGroupNestedSerializer()
@ -58,9 +57,6 @@ class RackSerializer(serializers.ModelSerializer):
model = Rack model = Rack
fields = ['id', 'name', 'facility_id', 'display_name', 'site', 'group', 'u_height', 'comments'] fields = ['id', 'name', 'facility_id', 'display_name', 'site', 'group', 'u_height', 'comments']
def get_display_name(self, obj):
return str(obj)
class RackNestedSerializer(RackSerializer): class RackNestedSerializer(RackSerializer):

8
netbox/dcim/models.py
View File

@ -177,8 +177,6 @@ class Rack(models.Model):
] ]
def __unicode__(self): def __unicode__(self):
if self.facility_id:
return "{} ({})".format(self.name, self.facility_id)
return self.name return self.name
def get_absolute_url(self): def get_absolute_url(self):
@ -197,6 +195,12 @@ class Rack(models.Model):
def units(self): def units(self):
return reversed(range(1, self.u_height + 1)) 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): 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'} Return a list of rack units as dictionaries. Example: {'device': None, 'face': 0, 'id': 48, 'name': 'U48'}