NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 01:41:22 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixes #2901: Fix ordering regions by site count

Browse Source
This commit is contained in:
Jeremy Stretch 2019-02-15 10:10:26 -05:00
parent 7a0ab3aa15
commit 3bc182e453
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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 * [#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 * [#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 * [#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) v2.5.6 (2019-02-13)

3
netbox/dcim/models.py
View File

@ -217,8 +217,7 @@ class Region(MPTTModel, ChangeLoggedModel):
self.parent.name if self.parent else None, self.parent.name if self.parent else None,
) )
@property def get_site_count(self):
def site_count(self):
return Site.objects.filter( return Site.objects.filter(
Q(region=self) | Q(region=self) |
Q(region__in=self.get_descendants()) Q(region__in=self.get_descendants())

8
netbox/dcim/views.py
View File

@ -135,7 +135,13 @@ class BulkDisconnectView(GetReturnURLMixin, View):
# #
class RegionListView(ObjectListView): 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 = filters.RegionFilter
filter_form = forms.RegionFilterForm filter_form = forms.RegionFilterForm
table = tables.RegionTable table = tables.RegionTable