NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-15 08:12:18 -06:00
Code Issues Actions 14 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

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

@@ -50,7 +50,7 @@
<td>VLAN</td>
<td>
{% if prefix.vlan %}
<a href="{% url 'ipam:vlan' pk=prefix.vlan.pk %}">{{ prefix.vlan.name }} ({{ prefix.vlan.vid }})</a>
<a href="{% url 'ipam:vlan' pk=prefix.vlan.pk %}">{{ prefix.vlan.display_name }}</a>
{% else %}
<span class="text-muted">Not assigned</span>
{% endif %}

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

@@ -1,7 +1,7 @@
{% extends '_base.html' %}
{% load render_table from django_tables2 %}
{% block title %}VLAN {{ vlan }}{% endblock %}
{% block title %}VLAN {{ vlan.display_name }}{% endblock %}
{% block content %}
<div class="row">
@@ -55,6 +55,10 @@
<td>VLAN ID</td>
<td>{{ vlan.vid }}</td>
</tr>
<tr>
<td>Name</td>
<td>{{ vlan.name }}</td>
</tr>
<tr>
<td>Status</td>
<td>
@@ -85,7 +89,7 @@
<a href="{% url 'dcim:site' slug=p.site.slug %}">{{ p.site }}</a>
{% endif %}
</td>
<td>{{ p.status }}</td>
<td>{{ p.get_status_display }}</td>
<td>{{ p.role }}</td>
</tr>
{% endfor %}