diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fa425d2c..68be13e7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ v2.5.7 (FUTURE) * [#2888](https://github.com/digitalocean/netbox/issues/2888) - Correct foreground color of device roles in rack elevations * [#2893](https://github.com/digitalocean/netbox/issues/2893) - Remove duplicate display of VRF RD on IP address view * [#2895](https://github.com/digitalocean/netbox/issues/2895) - Fix filtering of nullable character fields +* [#2901](https://github.com/digitalocean/netbox/issues/2901) - Fix ordering regions by site count v2.5.6 (2019-02-13) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index fbbfdf0c8..f7892b2af 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -217,8 +217,7 @@ class Region(MPTTModel, ChangeLoggedModel): self.parent.name if self.parent else None, ) - @property - def site_count(self): + def get_site_count(self): return Site.objects.filter( Q(region=self) | Q(region__in=self.get_descendants()) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 9aa4b2354..dfe94625e 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -135,7 +135,13 @@ class BulkDisconnectView(GetReturnURLMixin, View): # class RegionListView(ObjectListView): - queryset = Region.objects.all() + queryset = Region.objects.add_related_count( + Region.objects.all(), + Site, + 'region', + 'site_count', + cumulative=True + ) filter = filters.RegionFilter filter_form = forms.RegionFilterForm table = tables.RegionTable