From 076b7babcb13c64db82d560aee1cfc0b71345809 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 5 Jun 2020 14:20:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E7=9A=84api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/api.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/audits/api.py b/apps/audits/api.py index 162d50977..1d91a7433 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -5,7 +5,7 @@ from django.db.models import F, Value from django.db.models.functions import Concat from common.permissions import IsOrgAdminOrAppUser, IsOrgAuditor, IsOrgAdmin -from common.drf.filters import DatetimeRangeFilter, current_user_filter +from common.drf.filters import DatetimeRangeFilter from common.api import CommonGenericViewSet from orgs.mixins.api import OrgGenericViewSet, OrgBulkModelViewSet, OrgRelationMixin from orgs.utils import current_org @@ -13,7 +13,6 @@ from ops.models import CommandExecution from .models import FTPLog, UserLoginLog, OperateLog, PasswordChangeLog from .serializers import FTPLogSerializer, UserLoginLogSerializer, CommandExecutionSerializer from .serializers import OperateLogSerializer, PasswordChangeLogSerializer, CommandExecutionHostsRelationSerializer -from .filters import CurrentOrgMembersFilter class FTPLogViewSet(ListModelMixin, OrgGenericViewSet): @@ -88,7 +87,7 @@ class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet): model = CommandExecution serializer_class = CommandExecutionSerializer permission_classes = [IsOrgAdmin | IsOrgAuditor] - extra_filter_backends = [DatetimeRangeFilter, CurrentOrgMembersFilter] + extra_filter_backends = [DatetimeRangeFilter] date_range_filter_fields = [ ('date_start', ('date_from', 'date_to')) ] @@ -96,6 +95,11 @@ class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet): search_fields = ['command', 'user__name', 'run_as__name'] ordering = ['-date_created'] + def get_queryset(self): + queryset = super().get_queryset() + queryset = queryset.filter(run_as__org_id=current_org.org_id()) + return queryset + class CommandExecutionHostRelationViewSet(OrgRelationMixin, OrgBulkModelViewSet): serializer_class = CommandExecutionHostsRelationSerializer -- GitLab