diff --git a/apps/audits/api.py b/apps/audits/api.py index c401d0333..f0499253c 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -42,6 +42,11 @@ from .models import ( FTPLog, UserLoginLog, OperateLog, PasswordChangeLog, ActivityLog, JobLog, UserSession, IntegrationApplicationLog ) +from .reporting import ( + FTPLogReportExporter, UserLoginLogReportExporter, PasswordChangeLogReportExporter, + OperateLogReportExporter, JobsAuditReportExporter, + JobLogAuditReportExporter, +) from .serializers import ( FTPLogSerializer, UserLoginLogSerializer, JobLogSerializer, OperateLogSerializer, OperateLogActionDetailSerializer, @@ -49,11 +54,6 @@ from .serializers import ( FileSerializer, UserSessionSerializer, JobsAuditSerializer, ServiceAccessLogSerializer, OperateLogFullSerializer ) -from .reporting import ( - FTPLogReportExporter, UserLoginLogReportExporter, PasswordChangeLogReportExporter, - OperateLogReportExporter, JobsAuditReportExporter, - JobLogAuditReportExporter, -) from .utils import construct_userlogin_usernames, record_operate_log_and_activity_log logger = get_logger(__name__) @@ -110,7 +110,7 @@ class FTPLogViewSet(ReportExportMixin, OrgModelViewSet): date_range_filter_fields = [ ('date_start', ('date_from', 'date_to')) ] - filterset_fields = ['user', 'asset', 'account', 'filename', 'session'] + filterset_fields = ['id', 'user', 'asset', 'account', 'filename', 'session'] search_fields = filterset_fields ordering = ['-date_start'] http_method_names = ['post', 'get', 'head', 'options', 'patch']