mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-08 00:28:16 -06:00
Use regular imports for ScriptJob
This commit is contained in:
parent
ecf8e79fdd
commit
7f0a4e3c34
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user