mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-16 04:02:52 -06:00
Prefetch Tenant Group on user configurable tables
Prefetch the Tenant Group in views which allows its table to be configured by the user. This decreases the amount of database queries that are required to fetch the data.
This commit is contained in:
parent
c7ece43a18
commit
1539769c08
@ -30,7 +30,7 @@ class ProviderView(generic.ObjectView):
|
|||||||
circuits = Circuit.objects.restrict(request.user, 'view').filter(
|
circuits = Circuit.objects.restrict(request.user, 'view').filter(
|
||||||
provider=instance
|
provider=instance
|
||||||
).prefetch_related(
|
).prefetch_related(
|
||||||
'type', 'tenant', 'terminations__site'
|
'type', 'tenant', 'tenant__group', 'terminations__site'
|
||||||
)
|
)
|
||||||
circuits_table = tables.CircuitTable(circuits, user=request.user, exclude=('provider',))
|
circuits_table = tables.CircuitTable(circuits, user=request.user, exclude=('provider',))
|
||||||
circuits_table.configure(request)
|
circuits_table.configure(request)
|
||||||
@ -91,7 +91,7 @@ class ProviderNetworkView(generic.ObjectView):
|
|||||||
Q(termination_a__provider_network=instance.pk) |
|
Q(termination_a__provider_network=instance.pk) |
|
||||||
Q(termination_z__provider_network=instance.pk)
|
Q(termination_z__provider_network=instance.pk)
|
||||||
).prefetch_related(
|
).prefetch_related(
|
||||||
'type', 'tenant', 'terminations__site'
|
'type', 'tenant', 'tenant__group', 'terminations__site'
|
||||||
)
|
)
|
||||||
circuits_table = tables.CircuitTable(circuits, user=request.user)
|
circuits_table = tables.CircuitTable(circuits, user=request.user)
|
||||||
circuits_table.configure(request)
|
circuits_table.configure(request)
|
||||||
@ -192,7 +192,7 @@ class CircuitTypeBulkDeleteView(generic.BulkDeleteView):
|
|||||||
|
|
||||||
class CircuitListView(generic.ObjectListView):
|
class CircuitListView(generic.ObjectListView):
|
||||||
queryset = Circuit.objects.prefetch_related(
|
queryset = Circuit.objects.prefetch_related(
|
||||||
'provider', 'type', 'tenant', 'termination_a', 'termination_z'
|
'provider', 'type', 'tenant', 'tenant__group', 'termination_a', 'termination_z'
|
||||||
)
|
)
|
||||||
filterset = filtersets.CircuitFilterSet
|
filterset = filtersets.CircuitFilterSet
|
||||||
filterset_form = forms.CircuitFilterForm
|
filterset_form = forms.CircuitFilterForm
|
||||||
|
@ -561,7 +561,7 @@ class RackRoleBulkDeleteView(generic.BulkDeleteView):
|
|||||||
|
|
||||||
class RackListView(generic.ObjectListView):
|
class RackListView(generic.ObjectListView):
|
||||||
queryset = Rack.objects.prefetch_related(
|
queryset = Rack.objects.prefetch_related(
|
||||||
'site', 'location', 'tenant', 'role', 'devices__device_type'
|
'site', 'location', 'tenant', 'tenant_group', 'role', 'devices__device_type'
|
||||||
).annotate(
|
).annotate(
|
||||||
device_count=count_related(Device, 'rack')
|
device_count=count_related(Device, 'rack')
|
||||||
)
|
)
|
||||||
|
@ -298,7 +298,7 @@ class AggregatePrefixesView(generic.ObjectChildrenView):
|
|||||||
def get_children(self, request, parent):
|
def get_children(self, request, parent):
|
||||||
return Prefix.objects.restrict(request.user, 'view').filter(
|
return Prefix.objects.restrict(request.user, 'view').filter(
|
||||||
prefix__net_contained_or_equal=str(parent.prefix)
|
prefix__net_contained_or_equal=str(parent.prefix)
|
||||||
).prefetch_related('site', 'role', 'tenant', 'vlan')
|
).prefetch_related('site', 'role', 'tenant', 'tenant__group', 'vlan')
|
||||||
|
|
||||||
def prep_table_data(self, request, queryset, parent):
|
def prep_table_data(self, request, queryset, parent):
|
||||||
# Determine whether to show assigned prefixes, available prefixes, or both
|
# Determine whether to show assigned prefixes, available prefixes, or both
|
||||||
@ -470,7 +470,7 @@ class PrefixPrefixesView(generic.ObjectChildrenView):
|
|||||||
|
|
||||||
def get_children(self, request, parent):
|
def get_children(self, request, parent):
|
||||||
return parent.get_child_prefixes().restrict(request.user, 'view').prefetch_related(
|
return parent.get_child_prefixes().restrict(request.user, 'view').prefetch_related(
|
||||||
'site', 'vrf', 'vlan', 'role', 'tenant',
|
'site', 'vrf', 'vlan', 'role', 'tenant', 'tenant__group'
|
||||||
)
|
)
|
||||||
|
|
||||||
def prep_table_data(self, request, queryset, parent):
|
def prep_table_data(self, request, queryset, parent):
|
||||||
@ -499,7 +499,7 @@ class PrefixIPRangesView(generic.ObjectChildrenView):
|
|||||||
|
|
||||||
def get_children(self, request, parent):
|
def get_children(self, request, parent):
|
||||||
return parent.get_child_ranges().restrict(request.user, 'view').prefetch_related(
|
return parent.get_child_ranges().restrict(request.user, 'view').prefetch_related(
|
||||||
'vrf', 'role', 'tenant',
|
'vrf', 'role', 'tenant', 'tenant__group',
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_extra_context(self, request, instance):
|
def get_extra_context(self, request, instance):
|
||||||
@ -587,7 +587,7 @@ class IPRangeIPAddressesView(generic.ObjectChildrenView):
|
|||||||
|
|
||||||
def get_children(self, request, parent):
|
def get_children(self, request, parent):
|
||||||
return parent.get_child_ips().restrict(request.user, 'view').prefetch_related(
|
return parent.get_child_ips().restrict(request.user, 'view').prefetch_related(
|
||||||
'vrf', 'role', 'tenant',
|
'vrf', 'role', 'tenant', 'tenant__group',
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_extra_context(self, request, instance):
|
def get_extra_context(self, request, instance):
|
||||||
|
Loading…
Reference in New Issue
Block a user