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

12552 make queryset not have tree fields by default

Browse Source
This commit is contained in:
Arthur
2023-05-25 10:27:28 -07:00
parent 786394fbe8
commit 993154db9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/utilities/tree_queries.py
View File

@ -24,7 +24,7 @@ class TreeManager(Manager.from_queryset(TreeQuerySet), TreeManager_):
Extend django-tree-queries TreeManager to incorporate RestrictedQuerySet().
"""
_with_tree_fields = True
_with_tree_fields = False
def add_related_count(
self,
@ -100,7 +100,7 @@ class TreeManager(Manager.from_queryset(TreeQuerySet), TreeManager_):
"rel_field": rel_field,
}
return queryset.annotate(**{count_attr: RawSQL(SQL.format(**params), {})})
return queryset.with_tree_fields().annotate(**{count_attr: RawSQL(SQL.format(**params), {})})
else:
current_rel_model = rel_model
for rel_field_part in rel_field.split("__"):
@ -117,4 +117,4 @@ class TreeManager(Manager.from_queryset(TreeQuerySet), TreeManager_):
rel_field: OuterRef(field_name),
}
subquery = rel_model.objects.filter(**subquery_filters, **extra_filters).values("pk")
return queryset.annotate(**{count_attr: SQCount(subquery)})
return queryset.with_tree_fields().annotate(**{count_attr: SQCount(subquery)})