github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-08 18:59:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v3' of github.com:jumpserver/jumpserver into v3

Browse Source
This commit is contained in:
Jiangjie.Bai
2022-10-27 15:48:02 +08:00
parent a260da6cec 1239247b5a
commit 5d37d1b7b1
25 changed files with 991 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/authentication/api/connection_token.py
View File

@@ -210,7 +210,7 @@ class ConnectionTokenMixin:
class ConnectionTokenViewSet(ConnectionTokenMixin, RootOrgViewMixin, JMSModelViewSet):
filterset_fields = (
'type', 'user_display', 'asset_display'
'user_display', 'asset_display'
)
search_fields = filterset_fields
serializer_classes = {