From 26e37c1da64b3348c1eb92ecd79e9ffe95e5e028 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 4 Aug 2020 12:09:10 -0400 Subject: [PATCH] Fixes #4455: Fix ordering of prefixes beneath aggregate when available space is hidden --- docs/release-notes/version-2.8.md | 1 + netbox/ipam/views.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/docs/release-notes/version-2.8.md b/docs/release-notes/version-2.8.md index e26450f2b..11bc66632 100644 --- a/docs/release-notes/version-2.8.md +++ b/docs/release-notes/version-2.8.md @@ -9,6 +9,7 @@ ### Bug Fixes +* [#4455](https://github.com/netbox-community/netbox/issues/4455) - Fix ordering of prefixes beneath aggregate when available space is hidden * [#4875](https://github.com/netbox-community/netbox/issues/4875) - Fix documentation for image attachments * [#4876](https://github.com/netbox-community/netbox/issues/4876) - Fix labels for sites in staging or decommissioning status * [#4880](https://github.com/netbox-community/netbox/issues/4880) - Fix removal of tagged VLANs if not assigned in bulk interface editing diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index fa81de77b..db8a75852 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -327,6 +327,8 @@ class AggregateView(PermissionRequiredMixin, View): prefix__net_contained_or_equal=str(aggregate.prefix) ).prefetch_related( 'site', 'role' + ).order_by( + 'prefix' ).annotate_depth( limit=0 )