NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #18721 from atownson/issue_18403

Browse Source 
Closes #18403: Do not retrieve the data field from Job objects unless needed
This commit is contained in:
bctiemann 2025-02-25 10:24:42 -05:00 committed by GitHub
commit 4a4596d5e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/core/views.py
View File

@ -165,7 +165,7 @@ class DataFileBulkDeleteView(generic.BulkDeleteView):
@register_model_view(Job, 'list', path='', detail=False) @register_model_view(Job, 'list', path='', detail=False)
class JobListView(generic.ObjectListView): class JobListView(generic.ObjectListView):
queryset = Job.objects.all() queryset = Job.objects.defer('data')
filterset = filtersets.JobFilterSet filterset = filtersets.JobFilterSet
filterset_form = forms.JobFilterForm filterset_form = forms.JobFilterForm
table = tables.JobTable table = tables.JobTable
@ -182,12 +182,12 @@ class JobView(generic.ObjectView):
@register_model_view(Job, 'delete') @register_model_view(Job, 'delete')
class JobDeleteView(generic.ObjectDeleteView): class JobDeleteView(generic.ObjectDeleteView):
queryset = Job.objects.all() queryset = Job.objects.defer('data')
@register_model_view(Job, 'bulk_delete', path='delete', detail=False) @register_model_view(Job, 'bulk_delete', path='delete', detail=False)
class JobBulkDeleteView(generic.BulkDeleteView): class JobBulkDeleteView(generic.BulkDeleteView):
queryset = Job.objects.all() queryset = Job.objects.defer('data')
filterset = filtersets.JobFilterSet filterset = filtersets.JobFilterSet
table = tables.JobTable table = tables.JobTable

2
netbox/netbox/views/generic/feature_views.py
View File

@ -166,7 +166,7 @@ class ObjectJobsView(ConditionalLoginRequiredMixin, View):
def get_jobs(self, instance): def get_jobs(self, instance):
object_type = ContentType.objects.get_for_model(instance) object_type = ContentType.objects.get_for_model(instance)
return Job.objects.filter( return Job.objects.defer('data').filter(
object_type=object_type, object_type=object_type,
object_id=instance.id object_id=instance.id
) )