NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-18 17:52:21 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Moved display_name from serializer to model

Browse Source
This commit is contained in:
Jeremy Stretch
2016-06-21 15:22:11 -04:00
parent 2866232b8b
commit f17938f156
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,6 @@ class AggregateNestedSerializer(AggregateSerializer):
#
class VLANSerializer(serializers.ModelSerializer):
display_name = serializers.SerializerMethodField()
site = SiteNestedSerializer()
role = RoleNestedSerializer()
@@ -86,9 +85,6 @@ class VLANSerializer(serializers.ModelSerializer):
model = VLAN
fields = ['id', 'site', 'vid', 'name', 'status', 'role', 'display_name']
def get_display_name(self, obj):
return "{} ({})".format(obj.vid, obj.name)
class VLANNestedSerializer(VLANSerializer):

6
netbox/ipam/models.py
View File

@@ -344,7 +344,7 @@ class VLAN(models.Model):
verbose_name_plural = 'VLANs'
def __unicode__(self):
return "{0} ({1})".format(self.vid, self.name)
return "VLAN {}".format(self.vid)
def get_absolute_url(self):
return reverse('ipam:vlan', args=[self.pk])
@@ -358,5 +358,9 @@ class VLAN(models.Model):
self.role.name if self.role else '',
])
@property
def display_name(self):
return "{} ({})".format(self.vid, self.name)
def get_status_class(self):
return STATUS_CHOICE_CLASSES[self.status]