Merge pull request #2284 from jumpserver/dev

Dev

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>

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)