github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-27 11:31:41 +00:00
Code Issues Projects Releases Wiki Activity

merge v3

Browse Source
This commit is contained in:
feng626
2022-08-29 19:53:04 +08:00
parent 3e1c832964 60cb1f8136
commit ca3d2271a8
138 changed files with 4665 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/audits/api.py
View File

@@ -12,6 +12,7 @@ from common.api import CommonGenericViewSet
from orgs.mixins.api import OrgGenericViewSet, OrgBulkModelViewSet, OrgRelationMixin
from orgs.utils import current_org
from ops.models import CommandExecution
from . import filters
from .models import FTPLog, UserLoginLog, OperateLog, PasswordChangeLog
from .serializers import FTPLogSerializer, UserLoginLogSerializer, CommandExecutionSerializer
from .serializers import OperateLogSerializer, PasswordChangeLogSerializer, CommandExecutionHostsRelationSerializer
@@ -128,10 +129,15 @@ class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet):
class CommandExecutionHostRelationViewSet(OrgRelationMixin, OrgBulkModelViewSet):
serializer_class = CommandExecutionHostsRelationSerializer
m2m_field = CommandExecution.hosts.field
<<<<<<< HEAD
filterset_fields = [
'id', 'asset', 'commandexecution'
]
search_fields = ('asset__name', )
=======
filterset_class = filters.CommandExecutionFilter
search_fields = ('asset__hostname', )
>>>>>>> origin
http_method_names = ['options', 'get']
rbac_perms = {
'GET': 'ops.view_commandexecution',