mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-11 04:09:45 +00:00
feat: job 增加组织限制
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
from django.shortcuts import get_object_or_404
|
||||
from rest_framework import viewsets
|
||||
|
||||
from ops.models import Job, JobExecution
|
||||
@@ -7,14 +6,17 @@ from ops.serializers.job import JobSerializer, JobExecutionSerializer
|
||||
__all__ = ['JobViewSet', 'JobExecutionViewSet']
|
||||
|
||||
from ops.tasks import run_ops_job, run_ops_job_executions
|
||||
from orgs.mixins.api import OrgBulkModelViewSet
|
||||
|
||||
|
||||
class JobViewSet(viewsets.ModelViewSet):
|
||||
class JobViewSet(OrgBulkModelViewSet):
|
||||
serializer_class = JobSerializer
|
||||
queryset = Job.objects.all()
|
||||
model = Job
|
||||
permission_classes = ()
|
||||
|
||||
def get_queryset(self):
|
||||
return self.queryset.filter(instant=False)
|
||||
query_set = super().get_queryset()
|
||||
return query_set.filter(instant=False)
|
||||
|
||||
def perform_create(self, serializer):
|
||||
instance = serializer.save()
|
||||
@@ -22,20 +24,20 @@ class JobViewSet(viewsets.ModelViewSet):
|
||||
run_ops_job.delay(instance.id)
|
||||
|
||||
|
||||
class JobExecutionViewSet(viewsets.ModelViewSet):
|
||||
class JobExecutionViewSet(OrgBulkModelViewSet):
|
||||
serializer_class = JobExecutionSerializer
|
||||
queryset = JobExecution.objects.all()
|
||||
http_method_names = ('get', 'post', 'head', 'options',)
|
||||
# filter_fields = ('type',)
|
||||
permission_classes = ()
|
||||
model = JobExecution
|
||||
|
||||
def perform_create(self, serializer):
|
||||
instance = serializer.save()
|
||||
run_ops_job_executions.delay(instance.id)
|
||||
|
||||
def get_queryset(self):
|
||||
query_set = super().get_queryset()
|
||||
job_id = self.request.query_params.get('job_id')
|
||||
job_type = self.request.query_params.get('type')
|
||||
if job_id:
|
||||
self.queryset = self.queryset.filter(job_id=job_id)
|
||||
if job_type:
|
||||
self.queryset = self.queryset.filter(job__type=job_type)
|
||||
return self.queryset
|
||||
self.queryset = query_set.filter(job_id=job_id)
|
||||
return query_set
|
||||
|
Reference in New Issue
Block a user