From c5d1ed126e515d42c2920f78fae1c92c5679209b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 26 Dec 2018 19:20:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9Jms=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jms | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jms b/jms
index 613de2fe3..f1d0a6944 100755
--- a/jms
+++ b/jms
@@ -58,9 +58,6 @@ def check_database_connection():
 def make_migrations():
     print("Check database structure change ...")
     os.chdir(os.path.join(BASE_DIR, 'apps'))
-    if len(os.listdir('assets/migrations')) < 4:
-        print("Make database migrations ...")
-        subprocess.call('python3 manage.py makemigrations', shell=True)
     print("Migrate model change to database ...")
     subprocess.call('python3 manage.py migrate', shell=True)
 

From 7c10f8743f61e38b25125ef1621555eb8bc82302 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 27 Dec 2018 11:39:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E4=BC=9A=E8=AF=9D=E7=BB=88=E7=AB=AF=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?vnc=E5=8D=8F=E8=AE=AEdisable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html
index 534dc4cd6..92c114966 100644
--- a/apps/terminal/templates/terminal/session_list.html
+++ b/apps/terminal/templates/terminal/session_list.html
@@ -104,10 +104,10 @@
                 <a onclick="window.open('/luna/replay/{{ session.id }}','luna', 'height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')" class="btn btn-xs btn-warning btn-replay" >{% trans "Replay" %}</a>
                 {% else %}
                 <!--<a onclick="window.open('/luna/monitor/{{ session.id }}','luna', 'height=600, width=800, top=0, left=0, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')" class="btn btn-xs btn-warning btn-monitor" >{% trans "Monitor" %}</a>-->
-                    {% if session.protocol == 'rdp' %}
-                        <a class="btn btn-xs btn-danger btn-term" disabled value="{{ session.id }}" terminal="{{ session.terminal.id }}" >{% trans "Terminate" %}</a>
-                    {% else %}
+                    {% if session.protocol == 'ssh' %}
                         <a class="btn btn-xs btn-danger btn-term" value="{{ session.id }}" terminal="{{ session.terminal.id }}" >{% trans "Terminate" %}</a>
+                    {% else %}
+                        <a class="btn btn-xs btn-danger btn-term" disabled value="{{ session.id }}" terminal="{{ session.terminal.id }}" >{% trans "Terminate" %}</a>
                     {% endif %}
                 {% endif %}
             </td>