mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-12 13:31:56 +00:00
Bugfix (#2350)
* [Update] 权限页面增加过滤规则 * [Update] 修改terminal注册,更新以后使用api完成 * [Update] 修改terminal注册,更新以后使用api完成 * [Update] 修改更新注册逻辑
This commit is contained in:
@@ -1,12 +1,16 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
from rest_framework import viewsets
|
||||
from rest_framework import viewsets, generics
|
||||
from rest_framework import status
|
||||
from rest_framework.response import Response
|
||||
|
||||
from common.permissions import IsSuperUser, WithBootstrapToken
|
||||
|
||||
|
||||
from ...models import Terminal
|
||||
from ...serializers import v2 as serializers
|
||||
|
||||
__all__ = ['TerminalViewSet', 'TerminalRegistrationViewSet']
|
||||
__all__ = ['TerminalViewSet', 'TerminalRegistrationApi']
|
||||
|
||||
|
||||
class TerminalViewSet(viewsets.ModelViewSet):
|
||||
@@ -15,8 +19,19 @@ class TerminalViewSet(viewsets.ModelViewSet):
|
||||
permission_classes = [IsSuperUser]
|
||||
|
||||
|
||||
class TerminalRegistrationViewSet(viewsets.ModelViewSet):
|
||||
queryset = Terminal.objects.filter(is_deleted=False)
|
||||
class TerminalRegistrationApi(generics.CreateAPIView):
|
||||
serializer_class = serializers.TerminalRegistrationSerializer
|
||||
permission_classes = [WithBootstrapToken]
|
||||
http_method_names = ['post']
|
||||
|
||||
def create(self, request, *args, **kwargs):
|
||||
data = request.data
|
||||
serializer = serializers.TerminalSerializer(
|
||||
data=data, context={'request': request}
|
||||
)
|
||||
serializer.is_valid(raise_exception=True)
|
||||
terminal = serializer.save()
|
||||
sa_serializer = serializer.sa_serializer_class(instance=terminal.user)
|
||||
data['service_account'] = sa_serializer.data
|
||||
return Response(data, status=status.HTTP_201_CREATED)
|
||||
|
||||
|
Reference in New Issue
Block a user