github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

merge: with dev

pull/4069/head
ibuler 2020-06-02 15:43:42 +08:00
parent a4ece2b271 b460e4abaa
commit 50bea55732
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/audits/api.py
View File

@ -24,7 +24,7 @@ class FTPLogViewSet(ListModelMixin, OrgGenericViewSet):
date_range_filter_fields = [ date_range_filter_fields = [
('date_start', ('date_from', 'date_to')) ('date_start', ('date_from', 'date_to'))
] ]
filterset_fields = ['user', 'asset', 'system_user'] filter_fields = ['user', 'asset', 'system_user']
search_fields = ['filename'] search_fields = ['filename']
@ -63,7 +63,7 @@ class OperateLogViewSet(ListModelMixin, OrgGenericViewSet):
] ]
filter_fields = ['user', 'action', 'resource_type', 'resource'] filter_fields = ['user', 'action', 'resource_type', 'resource']
search_fields = ['resource'] search_fields = ['resource']
ordering_fields = ['-datetime'] ordering = ['-datetime']
class PasswordChangeLogViewSet(ListModelMixin, CommonGenericViewSet): class PasswordChangeLogViewSet(ListModelMixin, CommonGenericViewSet):
@ -75,7 +75,7 @@ class PasswordChangeLogViewSet(ListModelMixin, CommonGenericViewSet):
('datetime', ('date_from', 'date_to')) ('datetime', ('date_from', 'date_to'))
] ]
filterset_fields = ['user'] filterset_fields = ['user']
ordering_fields = ['-datetime'] ordering = ['-datetime']
def get_queryset(self): def get_queryset(self):
users = current_org.get_org_members() users = current_org.get_org_members()
@ -94,4 +94,4 @@ class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet):
('date_start', ('date_from', 'date_to')) ('date_start', ('date_from', 'date_to'))
] ]
search_fields = ['command'] search_fields = ['command']
ordering_fields = ['-date_created'] ordering = ['-date_created']