NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-15 19:52:52 -06:00
Code Issues Actions 9 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.8.md
View File

@ -12,6 +12,7 @@
### Bug Fixes ### Bug Fixes
* [#3240](https://github.com/netbox-community/netbox/issues/3240) - Correct OpenAPI definition for available-prefixes endpoint * [#3240](https://github.com/netbox-community/netbox/issues/3240) - Correct OpenAPI definition for available-prefixes endpoint
* [#4595](https://github.com/netbox-community/netbox/issues/4595) - Ensure consistent display of non-racked and child devices on rack view
* [#4803](https://github.com/netbox-community/netbox/issues/4803) - Return IP family (4 or 6) as integer rather than string * [#4803](https://github.com/netbox-community/netbox/issues/4803) - Return IP family (4 or 6) as integer rather than string
* [#4821](https://github.com/netbox-community/netbox/issues/4821) - Restrict group options by selected site when bulk editing VLANs * [#4821](https://github.com/netbox-community/netbox/issues/4821) - Restrict group options by selected site when bulk editing VLANs
* [#4835](https://github.com/netbox-community/netbox/issues/4835) - Support passing multiple initial values for multiple choice fields * [#4835](https://github.com/netbox-community/netbox/issues/4835) - Support passing multiple initial values for multiple choice fields

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) 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( nonracked_devices = Device.objects.filter(
rack=rack, rack=rack,
position__isnull=True, position__isnull=True
parent_bay__isnull=True
).prefetch_related('device_type__manufacturer') ).prefetch_related('device_type__manufacturer')
if rack.group: if rack.group:
peer_racks = Rack.objects.filter(site=rack.site, group=rack.group) peer_racks = Rack.objects.filter(site=rack.site, group=rack.group)
else: else:

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

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