github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-23 08:49:04 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改 job 审计日志

Browse Source
This commit is contained in:
Aaron3S
2023-02-17 19:58:43 +08:00
committed by Jiangjie.Bai
parent 40b49e258e
commit a79a766a6a
11 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/audits/api.py
View File

@@ -11,15 +11,14 @@ from rest_framework.permissions import IsAuthenticated
from common.api import JMSGenericViewSet
from common.drf.filters import DatetimeRangeFilter
from common.plugins.es import QuerySet as ESQuerySet
from ops.models.job import JobAuditLog
from orgs.mixins.api import OrgGenericViewSet, OrgBulkModelViewSet
from orgs.utils import current_org, tmp_to_root_org
from orgs.models import Organization
from users.models import User
from .backends import TYPE_ENGINE_MAPPING
from .const import ActivityChoices
from .models import FTPLog, UserLoginLog, OperateLog, PasswordChangeLog, ActivityLog
from .serializers import FTPLogSerializer, UserLoginLogSerializer, JobAuditLogSerializer
from .models import FTPLog, UserLoginLog, OperateLog, PasswordChangeLog, ActivityLog, JobLog
from .serializers import FTPLogSerializer, UserLoginLogSerializer, JobLogSerializer
from .serializers import (
OperateLogSerializer, OperateLogActionDetailSerializer,
PasswordChangeLogSerializer, ActivityUnionLogSerializer,
@@ -27,13 +26,13 @@ from .serializers import (
class JobAuditViewSet(OrgBulkModelViewSet):
model = JobAuditLog
model = JobLog
extra_filter_backends = [DatetimeRangeFilter]
date_range_filter_fields = [
('date_start', ('date_from', 'date_to'))
]
search_fields = ['creator__name', 'material']
serializer_class = JobAuditLogSerializer
serializer_class = JobLogSerializer
ordering = ['-date_start']
http_method_names = ('get', 'head', 'options')