diff --git a/netbox/netbox/api/viewsets/__init__.py b/netbox/netbox/api/viewsets/__init__.py index d72507e8a..e5993828e 100644 --- a/netbox/netbox/api/viewsets/__init__.py +++ b/netbox/netbox/api/viewsets/__init__.py @@ -121,6 +121,11 @@ class NetBoxModelViewSet( obj.snapshot() return obj + def get_queryset(self): + qs = super().get_queryset() + ordering = qs.model._meta.ordering + return qs.order_by(*ordering) + def get_serializer(self, *args, **kwargs): # If a list of objects has been provided, initialize the serializer with many=True if isinstance(kwargs.get('data', {}), list): diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 88857ad54..72eaf6f1a 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -125,6 +125,11 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): # Request handlers # + def get_queryset(self, request): + qs = super().get_queryset(request) + ordering = qs.model._meta.ordering + return qs.order_by(*ordering) + def get(self, request): """ GET request handler.