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

Remove annotate_vlan_ranges() from VLANGroupQuerySet

Browse Source
This commit is contained in:
Jeremy Stretch 2024-07-13 10:45:44 -04:00
parent 7a646cdc94
commit 6171ce6038
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/ipam/querysets.py
View File

@ -66,12 +66,6 @@ class VLANGroupQuerySet(RestrictedQuerySet):
utilization=Round(F('vlan_count') * 100 / F('_total_vlan_ids'), 2) utilization=Round(F('vlan_count') * 100 / F('_total_vlan_ids'), 2)
) )
def annotate_vlan_ranges(self):
return self.annotate(
vid_range=Func(F('vlan_id_ranges'), function='unnest')
)
class VLANQuerySet(RestrictedQuerySet): class VLANQuerySet(RestrictedQuerySet):

4
netbox/ipam/views.py
View File

@ -915,7 +915,7 @@ class IPAddressContactsView(ObjectContactsView):
# #
class VLANGroupListView(generic.ObjectListView): class VLANGroupListView(generic.ObjectListView):
queryset = VLANGroup.objects.annotate_utilization().annotate_vlan_ranges().prefetch_related('tags') queryset = VLANGroup.objects.annotate_utilization()
filterset = filtersets.VLANGroupFilterSet filterset = filtersets.VLANGroupFilterSet
filterset_form = forms.VLANGroupFilterForm filterset_form = forms.VLANGroupFilterForm
table = tables.VLANGroupTable table = tables.VLANGroupTable
@ -923,7 +923,7 @@ class VLANGroupListView(generic.ObjectListView):
@register_model_view(VLANGroup) @register_model_view(VLANGroup)
class VLANGroupView(GetRelatedModelsMixin, generic.ObjectView): class VLANGroupView(GetRelatedModelsMixin, generic.ObjectView):
queryset = VLANGroup.objects.annotate_utilization().prefetch_related('tags') queryset = VLANGroup.objects.annotate_utilization()
def get_extra_context(self, request, instance): def get_extra_context(self, request, instance):
return { return {