diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 8fe0ad518..7340ea2a0 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -124,7 +124,6 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): """ model = self.queryset.model content_type = ContentType.objects.get_for_model(model) - requirement = get_prerequisite_model(self.queryset) if self.filterset: self.queryset = self.filterset(request.GET, self.queryset).qs @@ -172,7 +171,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): 'table': table, 'actions': actions, 'filter_form': self.filterset_form(request.GET, label_suffix='') if self.filterset_form else None, - 'prerequisite_model': requirement if requirement else None, + 'prerequisite_model': get_prerequisite_model(self.queryset), **self.get_extra_context(request), } diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index c9ff738d7..19401f79a 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -347,13 +347,12 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView): form = self.form(instance=obj, initial=initial_data) restrict_form_fields(form, request.user) - requirement = get_prerequisite_model(self.queryset) return render(request, self.template_name, { 'model': model, 'object': obj, 'form': form, 'return_url': self.get_return_url(request, obj), - 'prerequisite_model': requirement if requirement else None, + 'prerequisite_model': get_prerequisite_model(self.queryset), **self.get_extra_context(request, obj), }) diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index 9d3952a28..60eba6097 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -105,7 +105,6 @@ Context: {% include 'inc/missing_prerequisites.html' %} {% endif %} -
{% include 'htmx/table.html' %}