From 5a3e213fb4621b2208bac1def405806fdbaa9fab Mon Sep 17 00:00:00 2001 From: atownson <52260120+atownson@users.noreply.github.com> Date: Mon, 24 Feb 2025 09:07:16 -0600 Subject: [PATCH] Do not retrieve the data field from Job objects unless needed --- netbox/core/views.py | 6 +++--- netbox/netbox/views/generic/feature_views.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/core/views.py b/netbox/core/views.py index cd9cd6c67..194cbbc41 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -165,7 +165,7 @@ class DataFileBulkDeleteView(generic.BulkDeleteView): @register_model_view(Job, 'list', path='', detail=False) class JobListView(generic.ObjectListView): - queryset = Job.objects.all() + queryset = Job.objects.defer('data') filterset = filtersets.JobFilterSet filterset_form = forms.JobFilterForm table = tables.JobTable @@ -182,12 +182,12 @@ class JobView(generic.ObjectView): @register_model_view(Job, 'delete') class JobDeleteView(generic.ObjectDeleteView): - queryset = Job.objects.all() + queryset = Job.objects.defer('data') @register_model_view(Job, 'bulk_delete', path='delete', detail=False) class JobBulkDeleteView(generic.BulkDeleteView): - queryset = Job.objects.all() + queryset = Job.objects.defer('data') filterset = filtersets.JobFilterSet table = tables.JobTable diff --git a/netbox/netbox/views/generic/feature_views.py b/netbox/netbox/views/generic/feature_views.py index 1e17d5354..01c4b2862 100644 --- a/netbox/netbox/views/generic/feature_views.py +++ b/netbox/netbox/views/generic/feature_views.py @@ -166,7 +166,7 @@ class ObjectJobsView(ConditionalLoginRequiredMixin, View): def get_jobs(self, instance): object_type = ContentType.objects.get_for_model(instance) - return Job.objects.filter( + return Job.objects.defer('data').filter( object_type=object_type, object_id=instance.id )