Commit f74422e4 authored by ibuler's avatar ibuler

[Bugfix] 更改application models后导致 terminalstatus报错

parent 3120cef3
...@@ -109,7 +109,7 @@ class TerminalStatusViewSet(viewsets.ModelViewSet): ...@@ -109,7 +109,7 @@ class TerminalStatusViewSet(viewsets.ModelViewSet):
terminal_id = self.kwargs.get("terminal", None) terminal_id = self.kwargs.get("terminal", None)
if terminal_id: if terminal_id:
terminal = get_object_or_404(Terminal, id=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 return self.queryset
def perform_create(self, serializer): def perform_create(self, serializer):
...@@ -131,7 +131,7 @@ class TerminalSessionViewSet(viewsets.ModelViewSet): ...@@ -131,7 +131,7 @@ class TerminalSessionViewSet(viewsets.ModelViewSet):
terminal_id = self.kwargs.get("terminal", None) terminal_id = self.kwargs.get("terminal", None)
if terminal_id: if terminal_id:
terminal = get_object_or_404(Terminal, id=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 return self.queryset
...@@ -144,7 +144,7 @@ class TerminalTaskViewSet(viewsets.ModelViewSet): ...@@ -144,7 +144,7 @@ class TerminalTaskViewSet(viewsets.ModelViewSet):
terminal_id = self.kwargs.get("terminal", None) terminal_id = self.kwargs.get("terminal", None)
if terminal_id: if terminal_id:
terminal = get_object_or_404(Terminal, id=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"): if hasattr(self.request.user, "terminal"):
terminal = self.request.user.terminal terminal = self.request.user.terminal
......
...@@ -23,7 +23,7 @@ class TerminalSerializer(serializers.ModelSerializer): ...@@ -23,7 +23,7 @@ class TerminalSerializer(serializers.ModelSerializer):
@staticmethod @staticmethod
def get_is_alive(obj): 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): if log and timezone.now() - log.date_created < timezone.timedelta(seconds=600):
return True return True
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment