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/netbox/settings.py
This commit is contained in:
Jeremy Stretch
2017-03-08 15:18:32 -05:00
parent 4f6d2a8b71 70a05b4280
commit 68c099a2af
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/tables.py
View File

@@ -12,11 +12,11 @@ from .models import (
REGION_LINK = """
{% if record.get_children %}
<span style="padding-left: {{ record.get_ancestors|length }}0px "><i class="fa fa-caret-right"></i></a>
<span style="padding-left: {{ record.get_ancestors|length }}0px "><i class="fa fa-caret-right"></i>
{% else %}
<span style="padding-left: {{ record.get_ancestors|length }}9px">
{% endif %}
{{ record.name }}
<a href="{% url 'dcim:site_list' %}?region={{ record.slug }}">{{ record.name }}</a>
</span>
"""