From 7f0a4e3c34c06891d225535c36e3389fa6a8705d Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Tue, 30 Jul 2024 13:34:51 +0200 Subject: [PATCH] Use regular imports for ScriptJob --- netbox/extras/api/views.py | 4 ++-- netbox/extras/management/commands/runscript.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index d65bc4916..142be1b8a 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -12,9 +12,10 @@ from rest_framework.routers import APIRootView from rest_framework.viewsets import ModelViewSet, ReadOnlyModelViewSet from rq import Worker -from core.models import Job, ObjectType +from core.models import ObjectType from extras import filtersets from extras.models import * +from extras.jobs import ScriptJob from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired from netbox.api.features import SyncedDataMixin from netbox.api.metadata import ContentTypeMetadata @@ -273,7 +274,6 @@ class ScriptViewSet(ModelViewSet): raise RQWorkerNotRunningException() if input_serializer.is_valid(): - ScriptJob = import_string("extras.jobs.ScriptJob") ScriptJob.enqueue( instance=script, user=request.user, diff --git a/netbox/extras/management/commands/runscript.py b/netbox/extras/management/commands/runscript.py index f084e3a45..b6d6810ac 100644 --- a/netbox/extras/management/commands/runscript.py +++ b/netbox/extras/management/commands/runscript.py @@ -7,6 +7,7 @@ from django.contrib.auth import get_user_model from django.core.management.base import BaseCommand, CommandError from django.utils.module_loading import import_string +from extras.jobs import ScriptJob from extras.scripts import get_module_and_script from utilities.request import NetBoxFakeRequest @@ -84,7 +85,6 @@ class Command(BaseCommand): raise CommandError() # Execute the script. - ScriptJob = import_string("extras.jobs.ScriptJob") job = ScriptJob.enqueue( instance=script_obj, user=user,