From aead9ac516c9fa8520bf2964f070efbe6845f243 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 25 Nov 2020 14:55:29 -0500 Subject: [PATCH] Remove extraneous order_by() calls --- netbox/dcim/api/views.py | 10 +++++----- netbox/extras/api/views.py | 2 +- netbox/ipam/api/views.py | 12 ++++++------ netbox/ipam/views.py | 2 +- netbox/virtualization/api/views.py | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 7afd3e0a6..0e0e074e1 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -109,7 +109,7 @@ class SiteViewSet(CustomFieldModelViewSet): vlan_count=get_subquery(VLAN, 'site'), circuit_count=get_subquery(Circuit, 'terminations__site'), virtualmachine_count=get_subquery(VirtualMachine, 'cluster__site'), - ).order_by(*Site._meta.ordering) + ) serializer_class = serializers.SiteSerializer filterset_class = filters.SiteFilterSet @@ -162,7 +162,7 @@ class RackViewSet(CustomFieldModelViewSet): ).annotate( device_count=get_subquery(Device, 'rack'), powerfeed_count=get_subquery(PowerFeed, 'rack') - ).order_by(*Rack._meta.ordering) + ) serializer_class = serializers.RackSerializer filterset_class = filters.RackFilterSet @@ -237,7 +237,7 @@ class ManufacturerViewSet(ModelViewSet): devicetype_count=get_subquery(DeviceType, 'manufacturer'), inventoryitem_count=get_subquery(InventoryItem, 'manufacturer'), platform_count=get_subquery(Platform, 'manufacturer') - ).order_by(*Manufacturer._meta.ordering) + ) serializer_class = serializers.ManufacturerSerializer filterset_class = filters.ManufacturerFilterSet @@ -314,7 +314,7 @@ class DeviceRoleViewSet(ModelViewSet): queryset = DeviceRole.objects.annotate( device_count=get_subquery(Device, 'device_role'), virtualmachine_count=get_subquery(VirtualMachine, 'role') - ).order_by(*DeviceRole._meta.ordering) + ) serializer_class = serializers.DeviceRoleSerializer filterset_class = filters.DeviceRoleFilterSet @@ -327,7 +327,7 @@ class PlatformViewSet(ModelViewSet): queryset = Platform.objects.annotate( device_count=get_subquery(Device, 'platform'), virtualmachine_count=get_subquery(VirtualMachine, 'platform') - ).order_by(*Platform._meta.ordering) + ) serializer_class = serializers.PlatformSerializer filterset_class = filters.PlatformFilterSet diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 7383d6a7a..6efcc65a6 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -149,7 +149,7 @@ class ExportTemplateViewSet(ModelViewSet): class TagViewSet(ModelViewSet): queryset = Tag.objects.annotate( tagged_items=get_subquery(TaggedItem, 'tag') - ).order_by(*Tag._meta.ordering) + ) serializer_class = serializers.TagSerializer filterset_class = filters.TagFilterSet diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index 8377f562c..eab1af929 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -32,7 +32,7 @@ class VRFViewSet(CustomFieldModelViewSet): queryset = VRF.objects.prefetch_related('tenant').prefetch_related('tags').annotate( ipaddress_count=get_subquery(IPAddress, 'vrf'), prefix_count=get_subquery(Prefix, 'vrf') - ).order_by(*VRF._meta.ordering) + ) serializer_class = serializers.VRFSerializer filterset_class = filters.VRFFilterSet @@ -67,7 +67,7 @@ class RoleViewSet(ModelViewSet): queryset = Role.objects.annotate( prefix_count=get_subquery(Prefix, 'role'), vlan_count=get_subquery(VLAN, 'role') - ).order_by(*Role._meta.ordering) + ) serializer_class = serializers.RoleSerializer filterset_class = filters.RoleFilterSet @@ -79,7 +79,7 @@ class RoleViewSet(ModelViewSet): class PrefixViewSet(CustomFieldModelViewSet): queryset = Prefix.objects.prefetch_related( 'site', 'vrf__tenant', 'tenant', 'vlan', 'role', 'tags' - ).order_by(*Prefix._meta.ordering) + ) serializer_class = serializers.PrefixSerializer filterset_class = filters.PrefixFilterSet @@ -249,7 +249,7 @@ class PrefixViewSet(CustomFieldModelViewSet): class IPAddressViewSet(CustomFieldModelViewSet): queryset = IPAddress.objects.prefetch_related( 'vrf__tenant', 'tenant', 'nat_inside', 'nat_outside', 'tags', 'assigned_object' - ).order_by(*IPAddress._meta.ordering) + ) serializer_class = serializers.IPAddressSerializer filterset_class = filters.IPAddressFilterSet @@ -261,7 +261,7 @@ class IPAddressViewSet(CustomFieldModelViewSet): class VLANGroupViewSet(ModelViewSet): queryset = VLANGroup.objects.prefetch_related('site').annotate( vlan_count=get_subquery(VLAN, 'group') - ).order_by(*VLANGroup._meta.ordering) + ) serializer_class = serializers.VLANGroupSerializer filterset_class = filters.VLANGroupFilterSet @@ -275,7 +275,7 @@ class VLANViewSet(CustomFieldModelViewSet): 'site', 'group', 'tenant', 'role', 'tags' ).annotate( prefix_count=get_subquery(Prefix, 'vlan') - ).order_by(*VLAN._meta.ordering) + ) serializer_class = serializers.VLANSerializer filterset_class = filters.VLANFilterSet diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 7fe0a6353..8dad91d09 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -187,7 +187,7 @@ class RIRBulkDeleteView(BulkDeleteView): class AggregateListView(ObjectListView): queryset = Aggregate.objects.prefetch_related('rir').annotate( child_count=RawSQL('SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', ()) - ).order_by(*Aggregate._meta.ordering) + ) filterset = filters.AggregateFilterSet filterset_form = forms.AggregateFilterForm table = tables.AggregateDetailTable diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index 5c8afa954..f805adb2e 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -48,7 +48,7 @@ class ClusterViewSet(CustomFieldModelViewSet): ).annotate( device_count=get_subquery(Device, 'cluster'), virtualmachine_count=get_subquery(VirtualMachine, 'cluster') - ).order_by(*Cluster._meta.ordering) + ) serializer_class = serializers.ClusterSerializer filterset_class = filters.ClusterFilterSet