mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code 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

2
netbox/secrets/api/views.py
View File

@@ -27,7 +27,7 @@ ERR_PRIVKEY_INVALID = "Invalid private key."
class SecretRoleViewSet(ModelViewSet):
queryset = SecretRole.objects.annotate(
secret_count=Count('secrets')
)
).order_by(*SecretRole._meta.ordering)
serializer_class = serializers.SecretRoleSerializer
filterset_class = filters.SecretRoleFilterSet

4
netbox/secrets/views.py
View File

@@ -29,7 +29,7 @@ def get_session_key(request):
#
class SecretRoleListView(ObjectListView):
queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
queryset = SecretRole.objects.annotate(secret_count=Count('secrets')).order_by(*SecretRole._meta.ordering)
table = tables.SecretRoleTable
@@ -49,7 +49,7 @@ class SecretRoleBulkImportView(BulkImportView):
class SecretRoleBulkDeleteView(BulkDeleteView):
queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
queryset = SecretRole.objects.annotate(secret_count=Count('secrets')).order_by(*SecretRole._meta.ordering)
table = tables.SecretRoleTable