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

Exempt MPTT-based models from centrally applying ordering on querysets

Browse Source
This commit is contained in:
Brian Tiemann 2025-03-11 09:38:04 -04:00
parent 5d81f911d6
commit fd502d553c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/netbox/api/viewsets/__init__.py
View File

@ -12,6 +12,7 @@ from rest_framework.viewsets import GenericViewSet
from utilities.api import get_annotations_for_serializer, get_prefetches_for_serializer
from utilities.exceptions import AbortRequest
from utilities.mptt import TreeManager
from . import mixins
__all__ = (
@ -127,6 +128,9 @@ class NetBoxModelViewSet(
https://code.djangoproject.com/ticket/32811
"""
qs = super().get_queryset()
# MPTT-based models are exempt from this; use caution when annotating querysets of these models
if any(isinstance(manager, TreeManager) for manager in qs.model._meta.local_managers):
return qs
ordering = qs.model._meta.ordering
return qs.order_by(*ordering)

4
netbox/netbox/views/generic/bulk_views.py
View File

@ -27,6 +27,7 @@ from utilities.exceptions import AbortRequest, AbortTransaction, PermissionsViol
from utilities.forms import BulkRenameForm, ConfirmationForm, restrict_form_fields
from utilities.forms.bulk_import import BulkImportForm
from utilities.htmx import htmx_partial
from utilities.mptt import TreeManager
from utilities.permissions import get_permission_for_model
from utilities.views import GetReturnURLMixin, get_viewname
from .base import BaseMultiObjectView
@ -131,6 +132,9 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
https://code.djangoproject.com/ticket/32811
"""
qs = super().get_queryset(request)
# MPTT-based models are exempt from this; use caution when annotating querysets of these models
if any(isinstance(manager, TreeManager) for manager in qs.model._meta.local_managers):
return qs
ordering = qs.model._meta.ordering
return qs.order_by(*ordering)