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 Activity

Merge branch 'develop' into api2

Browse Source 
Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py
This commit is contained in:
Jeremy Stretch
2017-03-14 12:40:28 -04:00
parent 105d17748e d9f1bcbf15
commit 04aedcc056
14 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/templates/dcim/device.html
View File

@@ -43,8 +43,10 @@
<td>
{% if device.parent_bay %}
{% with device.parent_bay.device as parent %}
<span>U{{ parent.position }} / {{ parent.get_face_display }}
(<a href="{{ parent.get_absolute_url }}">{{ parent }}</a> - {{ device.parent_bay.name }})</span>
<a href="{{ parent.get_absolute_url }}">{{ parent }}</a> <i class="fa fa-angle-right"></i> {{ device.parent_bay.name }}
{% if parent.position %}
(U{{ parent.position }} / {{ parent.get_face_display }})
{% endif %}
{% endwith %}
{% elif device.rack and device.position %}
<span>U{{ device.position }} / {{ device.get_face_display }}</span>