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

Changelog & cleanup for #7668, #7717

Browse Source
This commit is contained in:
jeremystretch
2021-11-02 15:58:14 -04:00
parent 288a1d23e5
commit 3a192223a3
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/tables/ip.py
View File

@@ -269,7 +269,7 @@ class IPRangeTable(BaseTable):
model = IPRange
fields = (
'pk', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'description',
'utilization','tags',
'utilization', 'tags',
)
default_columns = (
'pk', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'description',

17
netbox/templates/dcim/location.html
View File

@@ -21,17 +21,14 @@
<tr>
<th scope="row">Name</th>
<td>{{ object.name }}</td>
<td></td>
</tr>
<tr>
<th scope="row">Description</th>
<td>{{ object.description|placeholder }}</td>
<td></td>
</tr>
<tr>
<th scope="row">Site</th>
<td><a href="{{ object.site.get_absolute_url }}">{{ object.site }}</a></td>
<td></td>
</tr>
<tr>
<th scope="row">Parent</th>
@@ -42,25 +39,25 @@
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
<td></td>
</tr>
<tr>
<th scope="row">Racks</th>
<td>
{% if rack_count %}
<div class="float-end noprint">
<a href="{% url 'dcim:rack_elevation_list' %}?location_id={{ object.pk }}" class="btn btn-sm btn-primary" title="View elevations">
<i class="mdi mdi-server"></i>
</a>
</div>
{% endif %}
<a href="{% url 'dcim:rack_list' %}?location_id={{ object.pk }}">{{ rack_count }}</a>
</td>
<td class="noprint text-end">
<a href="{% url 'dcim:rack_elevation_list' %}?location_id={{ object.pk }}" class="btn btn-sm btn-primary" title="View Elevations">
<i class="mdi mdi-server"></i>
</a>
</td>
</tr>
<tr>
<th scope="row">Devices</th>
<td>
<a href="{% url 'dcim:device_list' %}?location_id={{ object.pk }}">{{ device_count }}</a>
</td>
<td></td>
</tr>
</table>
</div>