NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Tweaked display names for Racks, VLANs

Browse Source
This commit is contained in:
Jeremy Stretch 2016-06-22 17:12:12 -04:00
parent dea3ca187a
commit 85a50c67de
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/models.py
View File

@ -178,7 +178,7 @@ class Rack(CreatedUpdatedModel):
] ]
def __unicode__(self): def __unicode__(self):
return self.name return self.display_name
def get_absolute_url(self): def get_absolute_url(self):
return reverse('dcim:rack', args=[self.pk]) return reverse('dcim:rack', args=[self.pk])
@ -560,9 +560,9 @@ class Device(CreatedUpdatedModel):
if self.name: if self.name:
return self.name return self.name
elif self.position: 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: else:
return "{} ({})".format(self.device_type, self.rack) return "{} ({})".format(self.device_type, self.rack.name)
@property @property
def identifier(self): def identifier(self):

3
netbox/ipam/forms.py
View File

@ -140,7 +140,8 @@ class PrefixForm(forms.ModelForm, BootstrapMixin):
site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False, label='Site', site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False, label='Site',
widget=forms.Select(attrs={'filter-for': 'vlan'})) widget=forms.Select(attrs={'filter-for': 'vlan'}))
vlan = forms.ModelChoiceField(queryset=VLAN.objects.all(), required=False, label='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: class Meta:
model = Prefix model = Prefix

2
netbox/ipam/models.py
View File

@ -345,7 +345,7 @@ class VLAN(CreatedUpdatedModel):
verbose_name_plural = 'VLANs' verbose_name_plural = 'VLANs'
def __unicode__(self): def __unicode__(self):
return "VLAN {}".format(self.vid) return self.display_name
def get_absolute_url(self): def get_absolute_url(self):
return reverse('ipam:vlan', args=[self.pk]) return reverse('ipam:vlan', args=[self.pk])

4
netbox/templates/dcim/rack.html
View File

@ -2,7 +2,7 @@
{% load helpers %} {% load helpers %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block title %}Rack {{ rack }} ({{ rack.site }}){% endblock %} {% block title %}{{ rack.site }} - Rack {{ rack.name }}{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
@ -52,7 +52,7 @@
</a> </a>
{% endif %} {% endif %}
</div> </div>
<h1>{{ rack.site }} / {{ rack.name }}</h1> <h1>Rack {{ rack.name }}</h1>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="panel panel-default"> <div class="panel panel-default">

2
netbox/templates/ipam/vlan.html
View File

@ -39,7 +39,7 @@
</a> </a>
{% endif %} {% endif %}
</div> </div>
<h1>{{ vlan }}</h1> <h1>VLAN {{ vlan.display_name }}</h1>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="panel panel-default"> <div class="panel panel-default">