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

feat: public setting添加key

pull/4088/head
ibuler 2020-06-09 10:17:16 +08:00
parent 31daaed4cd
commit ee4534ac4b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/assets/api/asset_user.py
View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
import coreapi
from django.conf import settings from django.conf import settings
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework import generics, filters from rest_framework import generics, filters
@ -54,6 +55,15 @@ class AssetUserSearchBackend(filters.BaseFilterBackend):
class AssetUserLatestFilterBackend(filters.BaseFilterBackend): class AssetUserLatestFilterBackend(filters.BaseFilterBackend):
def get_schema_fields(self, view):
return [
coreapi.Field(
name='latest', location='query', required=False,
type='string', example='1',
description='Only the latest version'
)
]
def filter_queryset(self, request, queryset, view): def filter_queryset(self, request, queryset, view):
latest = request.GET.get('latest') == '1' latest = request.GET.get('latest') == '1'
if latest: if latest:
@ -64,7 +74,7 @@ class AssetUserLatestFilterBackend(filters.BaseFilterBackend):
class AssetUserViewSet(CommonApiMixin, BulkModelViewSet): class AssetUserViewSet(CommonApiMixin, BulkModelViewSet):
serializer_classes = { serializer_classes = {
'default': serializers.AssetUserWriteSerializer, 'default': serializers.AssetUserWriteSerializer,
'list': serializers.AssetUserReadSerializer, 'display': serializers.AssetUserReadSerializer,
'retrieve': serializers.AssetUserReadSerializer, 'retrieve': serializers.AssetUserReadSerializer,
} }
permission_classes = [IsOrgAdminOrAppUser] permission_classes = [IsOrgAdminOrAppUser]

4
apps/settings/api.py
View File

@ -272,7 +272,9 @@ class PublicSettingApi(generics.RetrieveAPIView):
"SECURITY_MAX_IDLE_TIME": settings.SECURITY_MAX_IDLE_TIME, "SECURITY_MAX_IDLE_TIME": settings.SECURITY_MAX_IDLE_TIME,
"XPACK_ENABLED": settings.XPACK_ENABLED, "XPACK_ENABLED": settings.XPACK_ENABLED,
"XPACK_LICENSE_IS_VALID": settings.XPACK_LICENSE_IS_VALID, "XPACK_LICENSE_IS_VALID": settings.XPACK_LICENSE_IS_VALID,
"LOGIN_CONFIRM_ENABLE": settings.LOGIN_CONFIRM_ENABLE "LOGIN_CONFIRM_ENABLE": settings.LOGIN_CONFIRM_ENABLE,
"SECURITY_VIEW_AUTH_NEED_MFA": settings.SECURITY_VIEW_AUTH_NEED_MFA,
"SECURITY_MFA_VERIFY_TTL": settings.SECURITY_MFA_VERIFY_TTL
} }
} }
return instance return instance