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 @@ {% trans "Replay" %} {% else %} - {% if session.protocol == 'rdp' %} - {% trans "Terminate" %} - {% else %} + {% if session.protocol == 'ssh' %} {% trans "Terminate" %} + {% else %} + {% trans "Terminate" %} {% endif %} {% endif %} 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)