From cb4afabc9117eff1847ca945ddb73d6b65dd1721 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 15 May 2018 14:44:02 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?node=E8=8A=82=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwindows=20session=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/node.py | 8 ++++---- apps/terminal/api.py | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index b8b2707e6..bc78e408a 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -51,10 +51,10 @@ class NodeViewSet(BulkModelViewSet): else: return serializers.NodeSerializer - # def perform_create(self, serializer): - # child_key = Node.root().get_next_child_key() - # serializer.validated_data["key"] = child_key - # serializer.save() + def perform_create(self, serializer): + child_key = Node.root().get_next_child_key() + serializer.validated_data["key"] = child_key + serializer.save() class NodeWithAssetsApi(generics.ListAPIView): diff --git a/apps/terminal/api.py b/apps/terminal/api.py index eb4b6400a..c9bb68ed6 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -108,6 +108,9 @@ class StatusViewSet(viewsets.ModelViewSet): task_serializer_class = TaskSerializer def create(self, request, *args, **kwargs): + if self.request.query_params.get("from_guacamole", None): + return Response({"msg": "From guacamole, not support now"}) + self.handle_sessions() super().create(request, *args, **kwargs) tasks = self.request.user.terminal.task_set.filter(is_finished=False)