github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-30 21:30:49 +00:00
Code Issues Projects Releases Wiki Activity

[Fix] 修改一些api bug

Browse Source
This commit is contained in:
ibuler
2017-01-20 13:59:53 +08:00
parent ffed28c9c7
commit df94d11f53
7 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/applications/api.py
View File

@@ -23,17 +23,20 @@ class TerminalRegisterView(ListCreateAPIView):
def create(self, request, *args, **kwargs):
name = request.data.get('name', '')
remote_addr = request.META.get('X-Real-IP') or request.META.get('REMOTE_ADDR')
serializer = self.serializer_class(data={'name': name, 'remote_addr': remote_addr})
remote_addr = request.META.get('X-Real-IP') or \
request.META.get('REMOTE_ADDR')
serializer = self.serializer_class(
data={'name': name, 'remote_addr': remote_addr})
if get_object_or_none(Terminal, name=name):
return Response({'msg': 'Already register, Need administrator active it'}, status=200)
return Response({'msg': 'Already register, Need '
'administrator active it'}, status=200)
if serializer.is_valid():
terminal = serializer.save()
app_user, access_key = terminal.create_related_app_user()
data = {}
data['applications'] = copy.deepcopy(serializer.data)
data['terminal'] = copy.deepcopy(serializer.data)
data['user'] = app_user.to_json()
data['access_key_id'] = access_key.id
data['access_key_secret'] = access_key.secret
@@ -54,11 +57,11 @@ class TerminalViewSet(viewsets.ModelViewSet):
def create(self, request, *args, **kwargs):
return Response({'msg': 'Use register view except that'}, status=404)
def destroy(self, request, *args, **kwargs):
instance = self.get_object()
if instance.user is not None:
instance.user.delete()
return super(TerminalViewSet, self).destroy(request, *args, **kwargs)
# def destroy(self, request, *args, **kwargs):
# instance = self.get_object()
# if instance.user is not None:
# instance.user.delete()
# return super(TerminalViewSet, self).destroy(request, *args, **kwargs)
class TerminalHeatbeatViewSet(viewsets.ModelViewSet):