NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-21 21:02:23 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes #4595: Ensure consistent display of non-racked and child devices on rack view

Browse Source
This commit is contained in:
Jeremy Stretch
2020-07-16 15:45:27 -04:00
parent 1f9a440598
commit 9d243103f4
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/dcim/views.py
View File

@@ -399,11 +399,12 @@ class RackView(PermissionRequiredMixin, View):
rack = get_object_or_404(Rack.objects.prefetch_related('site__region', 'tenant__group', 'group', 'role'), pk=pk)
# Get 0U and child devices located within the rack
nonracked_devices = Device.objects.filter(
rack=rack,
position__isnull=True,
parent_bay__isnull=True
position__isnull=True
).prefetch_related('device_type__manufacturer')
if rack.group:
peer_racks = Rack.objects.filter(site=rack.site, group=rack.group)
else:

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

@@ -337,7 +337,7 @@
<th>Name</th>
<th>Role</th>
<th>Type</th>
<th>Parent</th>
<th colspan="2">Parent Device</th>
</tr>
{% for device in nonracked_devices %}
<tr{% if device.device_type.u_height %} class="warning"{% endif %}>
@@ -346,13 +346,12 @@
</td>
<td>{{ device.device_role }}</td>
<td>{{ device.device_type.display_name }}</td>
<td>
{% if device.parent_bay %}
<a href="{{ device.parent_bay.device.get_absolute_url }}">{{ device.parent_bay }}</a>
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
{% if device.parent_bay %}
<td><a href="{{ device.parent_bay.device.get_absolute_url }}">{{ device.parent_bay.device }}</a></td>
<td>{{ device.parent_bay }}</td>
{% else %}
<td colspan="2" class="text-muted">&mdash;</td>
{% endif %}
</tr>
{% endfor %}
</table>