github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/828/merge
ibuler 2017-12-01 17:35:28 +08:00
parent 3120cef335
commit f74422e4bb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/terminal/api.py
View File

@ -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

2
apps/terminal/serializers.py
View File

@ -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: