From f74422e4bb91bd302de84bf2b0b896efd093d592 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 1 Dec 2017 17:35:28 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E6=9B=B4=E6=94=B9application=20mode?= =?UTF-8?q?ls=E5=90=8E=E5=AF=BC=E8=87=B4=20terminalstatus=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api.py | 6 +++--- apps/terminal/serializers.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/terminal/api.py b/apps/terminal/api.py index 96b092c13..ca3e5b112 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -109,7 +109,7 @@ class TerminalStatusViewSet(viewsets.ModelViewSet): terminal_id = self.kwargs.get("terminal", None) if terminal_id: terminal = get_object_or_404(Terminal, id=terminal_id) - self.queryset = terminal.terminalstatus_set.all() + self.queryset = terminal.status_set.all() return self.queryset def perform_create(self, serializer): @@ -131,7 +131,7 @@ class TerminalSessionViewSet(viewsets.ModelViewSet): terminal_id = self.kwargs.get("terminal", None) if terminal_id: terminal = get_object_or_404(Terminal, id=terminal_id) - self.queryset = terminal.terminalstatus_set.all() + self.queryset = terminal.status_set.all() return self.queryset @@ -144,7 +144,7 @@ class TerminalTaskViewSet(viewsets.ModelViewSet): terminal_id = self.kwargs.get("terminal", None) if terminal_id: terminal = get_object_or_404(Terminal, id=terminal_id) - self.queryset = terminal.terminalstatus_set.all() + self.queryset = terminal.status_set.all() if hasattr(self.request.user, "terminal"): terminal = self.request.user.terminal diff --git a/apps/terminal/serializers.py b/apps/terminal/serializers.py index 1f6dc22c2..48a9d2a5b 100644 --- a/apps/terminal/serializers.py +++ b/apps/terminal/serializers.py @@ -23,7 +23,7 @@ class TerminalSerializer(serializers.ModelSerializer): @staticmethod def get_is_alive(obj): - log = obj.terminalstatus_set.last() + log = obj.status_set.last() if log and timezone.now() - log.date_created < timezone.timedelta(seconds=600): return True else: