From 6337d0d0a19d92dabcfec1bb8ede07820cfc79b4 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 14 Apr 2020 16:12:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=9Dcan=5Fjoin=E4=B8=BAproperty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/api/session.py | 2 +-
 apps/terminal/models.py      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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

From 77149bf36cdda2b64a4978dd65b79b1f12a6bfe8 Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 14 Apr 2020 17:50:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E5=A4=9A=E4=B8=AA=E4=BC=9A=E8=AF=9D=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=80=BB=E6=98=AF=E8=A6=86=E7=9B=96=E5=90=8C=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?tab=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/templates/terminal/session_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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();