diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 4e1deb252..0fe3bc30c 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -178,7 +178,7 @@ class Rack(CreatedUpdatedModel): ] def __unicode__(self): - return self.name + return self.display_name def get_absolute_url(self): return reverse('dcim:rack', args=[self.pk]) @@ -560,9 +560,9 @@ class Device(CreatedUpdatedModel): if self.name: return self.name elif self.position: - return "{} ({} U{})".format(self.device_type, self.rack, self.position) + return "{} ({} U{})".format(self.device_type, self.rack.name, self.position) else: - return "{} ({})".format(self.device_type, self.rack) + return "{} ({})".format(self.device_type, self.rack.name) @property def identifier(self): diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 91e73e790..616f628d6 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -140,7 +140,8 @@ class PrefixForm(forms.ModelForm, BootstrapMixin): site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False, label='Site', widget=forms.Select(attrs={'filter-for': 'vlan'})) vlan = forms.ModelChoiceField(queryset=VLAN.objects.all(), required=False, label='VLAN', - widget=APISelect(api_url='/api/ipam/vlans/?site_id={{site}}')) + widget=APISelect(api_url='/api/ipam/vlans/?site_id={{site}}', + display_field='display_name')) class Meta: model = Prefix diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index c6ab3e9fd..91d04a09a 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -345,7 +345,7 @@ class VLAN(CreatedUpdatedModel): verbose_name_plural = 'VLANs' def __unicode__(self): - return "VLAN {}".format(self.vid) + return self.display_name def get_absolute_url(self): return reverse('ipam:vlan', args=[self.pk]) diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 978e87ebe..20b86dc85 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -2,7 +2,7 @@ {% load helpers %} {% load render_table from django_tables2 %} -{% block title %}Rack {{ rack }} ({{ rack.site }}){% endblock %} +{% block title %}{{ rack.site }} - Rack {{ rack.name }}{% endblock %} {% block content %}