NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 08:38:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Use regular imports for ScriptJob

Browse Source
This commit is contained in:
Alexander Haase 2024-07-30 13:34:51 +02:00
parent ecf8e79fdd
commit 7f0a4e3c34
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/api/views.py
View File

@ -12,9 +12,10 @@ from rest_framework.routers import APIRootView
from rest_framework.viewsets import ModelViewSet, ReadOnlyModelViewSet from rest_framework.viewsets import ModelViewSet, ReadOnlyModelViewSet
from rq import Worker from rq import Worker
from core.models import Job, ObjectType from core.models import ObjectType
from extras import filtersets from extras import filtersets
from extras.models import * from extras.models import *
from extras.jobs import ScriptJob
from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired from netbox.api.authentication import IsAuthenticatedOrLoginNotRequired
from netbox.api.features import SyncedDataMixin from netbox.api.features import SyncedDataMixin
from netbox.api.metadata import ContentTypeMetadata from netbox.api.metadata import ContentTypeMetadata
@ -273,7 +274,6 @@ class ScriptViewSet(ModelViewSet):
raise RQWorkerNotRunningException() raise RQWorkerNotRunningException()
if input_serializer.is_valid(): if input_serializer.is_valid():
ScriptJob = import_string("extras.jobs.ScriptJob")
ScriptJob.enqueue( ScriptJob.enqueue(
instance=script, instance=script,
user=request.user, user=request.user,

2
netbox/extras/management/commands/runscript.py
View File

@ -7,6 +7,7 @@ from django.contrib.auth import get_user_model
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.utils.module_loading import import_string from django.utils.module_loading import import_string
from extras.jobs import ScriptJob
from extras.scripts import get_module_and_script from extras.scripts import get_module_and_script
from utilities.request import NetBoxFakeRequest from utilities.request import NetBoxFakeRequest
@ -84,7 +85,6 @@ class Command(BaseCommand):
raise CommandError() raise CommandError()
# Execute the script. # Execute the script.
ScriptJob = import_string("extras.jobs.ScriptJob")
job = ScriptJob.enqueue( job = ScriptJob.enqueue(
instance=script_obj, instance=script_obj,
user=user, user=user,