From 4449003b5902bc4e23cc6bc896668483e8615d0b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 28 Mar 2023 15:09:36 -0400 Subject: [PATCH] Move generic relation to JobsMixin --- netbox/core/models/data.py | 5 ----- netbox/extras/models/reports.py | 6 ------ netbox/extras/models/scripts.py | 1 + netbox/netbox/models/features.py | 6 ++++++ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/netbox/core/models/data.py b/netbox/core/models/data.py index 7b5dc8c89..1c4175f96 100644 --- a/netbox/core/models/data.py +++ b/netbox/core/models/data.py @@ -71,11 +71,6 @@ class DataSource(JobsMixin, PrimaryModel): null=True, editable=False ) - jobs = GenericRelation( - to='core.Job', - content_type_field='object_type', - object_id_field='object_id' - ) class Meta: ordering = ('name',) diff --git a/netbox/extras/models/reports.py b/netbox/extras/models/reports.py index c650f8cf6..66006c90f 100644 --- a/netbox/extras/models/reports.py +++ b/netbox/extras/models/reports.py @@ -36,12 +36,6 @@ class ReportModule(PythonModuleMixin, JobsMixin, ManagedFile): """ Proxy model for report module files. """ - jobs = GenericRelation( - to='core.Job', - content_type_field='object_type', - object_id_field='object_id' - ) - objects = ReportModuleManager() class Meta: diff --git a/netbox/extras/models/scripts.py b/netbox/extras/models/scripts.py index 257a7b701..f830f134c 100644 --- a/netbox/extras/models/scripts.py +++ b/netbox/extras/models/scripts.py @@ -1,6 +1,7 @@ import inspect from functools import cached_property +from django.contrib.contenttypes.fields import GenericRelation from django.db import models from django.urls import reverse diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py index 760dae132..5573b1abc 100644 --- a/netbox/netbox/models/features.py +++ b/netbox/netbox/models/features.py @@ -299,6 +299,12 @@ class JobsMixin(models.Model): """ Enables support for job results. """ + jobs = GenericRelation( + to='core.Job', + content_type_field='object_type', + object_id_field='object_id' + ) + class Meta: abstract = True