diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index a58fca33a..7808d3070 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -367,9 +367,7 @@ class AggregatePrefixesView(generic.ObjectChildrenView): return add_requested_prefixes(parent.prefix, queryset, show_available, show_assigned) def get_extra_context(self, request, instance): - context = super().get_extra_context(request, instance) return { - **context, 'bulk_querystring': f'within={instance.prefix}', 'first_available_prefix': instance.get_first_available_prefix(), 'show_available': bool(request.GET.get('show_available', 'true') == 'true'), @@ -556,9 +554,7 @@ class PrefixPrefixesView(generic.ObjectChildrenView): return add_requested_prefixes(parent.prefix, queryset, show_available, show_assigned) def get_extra_context(self, request, instance): - context = super().get_extra_context(request, instance) return { - **context, 'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&within={instance.prefix}", 'first_available_prefix': instance.get_first_available_prefix(), 'show_available': bool(request.GET.get('show_available', 'true') == 'true'), @@ -586,9 +582,7 @@ class PrefixIPRangesView(generic.ObjectChildrenView): ) def get_extra_context(self, request, instance): - context = super().get_extra_context(request, instance) return { - **context, 'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&parent={instance.prefix}", 'first_available_ip': instance.get_first_available_ip(), } @@ -617,9 +611,7 @@ class PrefixIPAddressesView(generic.ObjectChildrenView): return queryset def get_extra_context(self, request, instance): - context = super().get_extra_context(request, instance) return { - **context, 'bulk_querystring': f"vrf_id={instance.vrf.pk if instance.vrf else '0'}&parent={instance.prefix}", 'first_available_ip': instance.get_first_available_ip(), } diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index 24695752d..a426898fb 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -113,15 +113,6 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin): """ return queryset - def get_extra_context(self, request, instance): - context = super().get_extra_context(request, instance) - - context.update({ - 'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html', - 'table_config': f'{self.table.__name__}_config', - }) - return context - # # Request handlers # @@ -153,7 +144,9 @@ class ObjectChildrenView(ObjectView, ActionsMixin, TableMixin): return render(request, self.get_template_name(), { 'object': instance, 'child_model': self.child_model, + 'base_template': f'{instance._meta.app_label}/{instance._meta.model_name}.html', 'table': table, + 'table_config': f'{self.table.__name__}_config', 'actions': actions, 'tab': self.tab, 'return_url': request.get_full_path(),