mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-07-02 07:01:30 +00:00
fix: Correct JobExecutionSerializer usage in ops tasks and API (#16850)
Co-authored-by: wangruidong <940853815@qq.com>
This commit is contained in:
@@ -134,7 +134,7 @@ class JobViewSet(LoginAssetACLCheckMixin, OrgBulkModelViewSet):
|
||||
def run_job(self, job, serializer):
|
||||
execution = job.create_execution()
|
||||
if self._parameters:
|
||||
execution.parameters = JobExecutionSerializer.validate_parameters(self._parameters)
|
||||
execution.parameters = JobExecutionSerializer().validate_parameters(self._parameters)
|
||||
execution.creator = self.request.user
|
||||
execution.save()
|
||||
assets = merge_nodes_and_assets(job.nodes.all(), job.assets.all(), self.request.user)
|
||||
|
||||
@@ -3,10 +3,10 @@ import datetime
|
||||
|
||||
from celery import shared_task
|
||||
from celery.exceptions import SoftTimeLimitExceeded
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django_celery_beat.models import PeriodicTask
|
||||
from django.conf import settings
|
||||
|
||||
from common.const.crontab import CRONTAB_AT_AM_TWO
|
||||
from common.utils import get_logger, get_object_or_none, get_log_keep_day
|
||||
@@ -69,7 +69,7 @@ def run_ops_job(job_id):
|
||||
execution = job.create_execution()
|
||||
execution.creator = job.creator
|
||||
if job.periodic_variable:
|
||||
execution.parameters = JobExecutionSerializer.validate_parameters(job.periodic_variable)
|
||||
execution.parameters = JobExecutionSerializer().validate_parameters(job.periodic_variable)
|
||||
_run_ops_job_execution(execution)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user