diff --git a/apps/terminal/api/session.py b/apps/terminal/api/session.py index 4653e673d..d2365bef0 100644 --- a/apps/terminal/api/session.py +++ b/apps/terminal/api/session.py @@ -141,7 +141,7 @@ class SessionJoinValidateAPI(views.APIView): if not session: msg = _('Session does not exist: {}'.format(session_id)) return Response({'ok': False, 'msg': msg}, status=401) - if not session.can_join(): + if not session.can_join: msg = _('Session is finished or the protocol not supported') return Response({'ok': False, 'msg': msg}, status=401) diff --git a/apps/terminal/models.py b/apps/terminal/models.py index 3dd34de86..a2dcbf8e0 100644 --- a/apps/terminal/models.py +++ b/apps/terminal/models.py @@ -243,6 +243,7 @@ class Session(OrgModelMixin): return True return False + @property def can_join(self): if self.is_finished: return False diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html index 6876ed448..c7e7dce6c 100644 --- a/apps/terminal/templates/terminal/session_list.html +++ b/apps/terminal/templates/terminal/session_list.html @@ -236,7 +236,7 @@ $(document).ready(function() { }).on('click', '.btn-replay', function () { var sessionID = $(this).data("session"); var replayUrl = "/luna/replay/" + sessionID; - window.open(replayUrl, "height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no"); + window.open(replayUrl, "_blank", "height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no"); }) .on('click', '.btn-download', function () { var sessionID = $(this).data("session"); @@ -254,7 +254,7 @@ $(document).ready(function() { .on('click', '.btn-join', function () { var sessionID = $(this).data("session"); var joinUrl = "/luna/join/?shareroom=" + sessionID; - window.open(joinUrl, "height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no"); + window.open(joinUrl) }) .on("click", '#session_table_filter input', function (e) { e.preventDefault();