From c3d9910e082f5878a9312c0ee18cadd5b7f8a671 Mon Sep 17 00:00:00 2001 From: Jason Yates Date: Thu, 7 Apr 2022 08:21:13 +0100 Subject: [PATCH 1/3] Limit amount of nonracked devices displayed Fixes #8920 Limits the amount of non-racked devices on Site and Location view to 10 and provides a link to the device list this is pre-filtered to the relevant site or location. --- netbox/dcim/views.py | 18 ++++- .../templates/dcim/inc/nonracked_devices.html | 68 +++++++++++-------- 2 files changed, 57 insertions(+), 29 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c0b46f16e..9b24ea9d1 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -346,7 +346,13 @@ class SiteView(generic.ObjectView): site=instance, position__isnull=True, parent_bay__isnull=True - ).prefetch_related('device_type__manufacturer') + ).prefetch_related('device_type__manufacturer').order_by('-pk')[:10] + + total_nonracked_devices_count = Device.objects.filter( + site=instance, + position__isnull=True, + parent_bay__isnull=True + ).count() asns = ASN.objects.restrict(request.user, 'view').filter(sites=instance) asn_count = asns.count() @@ -358,6 +364,7 @@ class SiteView(generic.ObjectView): 'locations': locations, 'asns': asns, 'nonracked_devices': nonracked_devices, + 'total_nonracked_devices_count': total_nonracked_devices_count, } @@ -439,13 +446,20 @@ class LocationView(generic.ObjectView): location=instance, position__isnull=True, parent_bay__isnull=True - ).prefetch_related('device_type__manufacturer') + ).prefetch_related('device_type__manufacturer').order_by('-pk')[:10] + + total_nonracked_devices_count = Device.objects.filter( + location=instance, + position__isnull=True, + parent_bay__isnull=True + ).count() return { 'rack_count': rack_count, 'device_count': device_count, 'child_locations_table': child_locations_table, 'nonracked_devices': nonracked_devices, + 'total_nonracked_devices_count': total_nonracked_devices_count, } diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html index 7f4da2f24..68112e2a7 100644 --- a/netbox/templates/dcim/inc/nonracked_devices.html +++ b/netbox/templates/dcim/inc/nonracked_devices.html @@ -1,40 +1,54 @@ {% load helpers %}
-
- Non-Racked Devices -
-
-{% if nonracked_devices %} - - - - - - - - {% for device in nonracked_devices %} - - - - - {% if device.parent_bay %} - - - {% else %} - +
+ Non-Racked Devices +
+
+ {% if nonracked_devices %} +
NameRoleTypeParent Device
- {{ device }} - {{ device.device_role }}{{ device.device_type }}{{ device.parent_bay.device|linkify }}{{ device.parent_bay }}—
+ + + + + + + {% for device in nonracked_devices %} + + + + + {% if device.parent_bay %} + + + {% else %} + + {% endif %} + + {% endfor %} +
NameRoleTypeParent Device
+ {{ device }} + {{ device.device_role }}{{ device.device_type }}{{ device.parent_bay.device|linkify }}{{ device.parent_bay }}—
+ + {% if nonracked_devices.count == 10 %} + {% if object|meta:'verbose_name' == 'site' %} +
+ Displaying 10 of {{ total_nonracked_devices_count }} devices (View full list) +
+ {% elif object|meta:'verbose_name' == 'location' %} +
+ Displaying 10 of {{ total_nonracked_devices_count }} devices (View full list) +
{% endif %} - - {% endfor %} - + {% endif %} + {% else %}
None
{% endif %}
+ {% if perms.dcim.add_device %} {% if object|meta:'verbose_name' == 'rack' %}
From 2781b8535cd20b38afca75815d02dbebc4a195c2 Mon Sep 17 00:00:00 2001 From: Jason Yates Date: Thu, 7 Apr 2022 08:32:50 +0100 Subject: [PATCH 2/3] Update nonracked_devices.html Fixing issue where Displaying 10 of 10 would appear when it's not required. --- netbox/templates/dcim/inc/nonracked_devices.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html index 68112e2a7..d4cd58839 100644 --- a/netbox/templates/dcim/inc/nonracked_devices.html +++ b/netbox/templates/dcim/inc/nonracked_devices.html @@ -30,14 +30,14 @@ {% endfor %} - {% if nonracked_devices.count == 10 %} + {% if total_nonracked_devices_count > nonracked_devices.count %} {% if object|meta:'verbose_name' == 'site' %}
- Displaying 10 of {{ total_nonracked_devices_count }} devices (View full list) + Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices (View full list)
{% elif object|meta:'verbose_name' == 'location' %}
- Displaying 10 of {{ total_nonracked_devices_count }} devices (View full list) + Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices (View full list)
{% endif %} {% endif %} From 23fddf74b6e07a8d15985f380dff23f8563a6a16 Mon Sep 17 00:00:00 2001 From: Jason Yates Date: Sun, 10 Apr 2022 09:06:14 +0100 Subject: [PATCH 3/3] Updating to use a single queryset Updating to use a single queryset for both template variables --- netbox/dcim/views.py | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 9b24ea9d1..bc2cbdcb8 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -342,17 +342,12 @@ class SiteView(generic.ObjectView): 'device_count', cumulative=True ).restrict(request.user, 'view').filter(site=instance) + nonracked_devices = Device.objects.filter( site=instance, position__isnull=True, parent_bay__isnull=True - ).prefetch_related('device_type__manufacturer').order_by('-pk')[:10] - - total_nonracked_devices_count = Device.objects.filter( - site=instance, - position__isnull=True, - parent_bay__isnull=True - ).count() + ).prefetch_related('device_type__manufacturer') asns = ASN.objects.restrict(request.user, 'view').filter(sites=instance) asn_count = asns.count() @@ -363,8 +358,8 @@ class SiteView(generic.ObjectView): 'stats': stats, 'locations': locations, 'asns': asns, - 'nonracked_devices': nonracked_devices, - 'total_nonracked_devices_count': total_nonracked_devices_count, + 'nonracked_devices': nonracked_devices.order_by('-pk')[:10], + 'total_nonracked_devices_count': nonracked_devices.count(), } @@ -442,24 +437,19 @@ class LocationView(generic.ObjectView): ).filter(pk__in=location_ids).exclude(pk=instance.pk) child_locations_table = tables.LocationTable(child_locations) child_locations_table.configure(request) + nonracked_devices = Device.objects.filter( location=instance, position__isnull=True, parent_bay__isnull=True - ).prefetch_related('device_type__manufacturer').order_by('-pk')[:10] - - total_nonracked_devices_count = Device.objects.filter( - location=instance, - position__isnull=True, - parent_bay__isnull=True - ).count() + ).prefetch_related('device_type__manufacturer') return { 'rack_count': rack_count, 'device_count': device_count, 'child_locations_table': child_locations_table, - 'nonracked_devices': nonracked_devices, - 'total_nonracked_devices_count': total_nonracked_devices_count, + 'nonracked_devices': nonracked_devices.order_by('-pk')[:10], + 'total_nonracked_devices_count': nonracked_devices.count(), }