starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-18 15:10:11 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Closes #4871: Specify ordering for querysets using annotate() to count related objects

Browse Source
This commit is contained in:
Jeremy Stretch
2020-07-20 12:07:19 -04:00
parent 39dc1f882a
commit 0f679e1f03
13 changed files with 113 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/tenancy/api/views.py
View File

@@ -15,8 +15,12 @@ from . import serializers
#
class TenantGroupViewSet(ModelViewSet):
queryset = TenantGroup.objects.annotate(
tenant_count=get_subquery(Tenant, 'group')
queryset = TenantGroup.objects.add_related_count(
TenantGroup.objects.all(),
Tenant,
'group',
'tenant_count',
cumulative=True
)
serializer_class = serializers.TenantGroupSerializer
filterset_class = filters.TenantGroupFilterSet

8
netbox/tenancy/views.py
View File

@@ -43,7 +43,13 @@ class TenantGroupBulkImportView(BulkImportView):
class TenantGroupBulkDeleteView(BulkDeleteView):
queryset = TenantGroup.objects.annotate(tenant_count=Count('tenants'))
queryset = TenantGroup.objects.add_related_count(
TenantGroup.objects.all(),
Tenant,
'group',
'tenant_count',
cumulative=True
)
table = tables.TenantGroupTable