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

perf: 合并冲突

Browse Source
This commit is contained in:
ibuler
2022-08-30 10:07:03 +08:00
parent c950508873
commit 951d4e4e0d
24 changed files with 140 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/audits/api.py
View File

@@ -129,15 +129,10 @@ 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',