diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index b90b18cce..f6e01360c 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index af1ae2a28..722ec609b 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-15 14:34+0800\n" +"POT-Creation-Date: 2020-07-15 17:13+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -2429,6 +2429,10 @@ msgstr "线程数" msgid "Boot Time" msgstr "运行时间" +#: terminal/models.py:191 +msgid "Login from" +msgstr "登录来源" + #: terminal/models.py:195 msgid "Replay" msgstr "回放" @@ -5104,9 +5108,6 @@ msgstr "旗舰版" #~ msgid "There is no command about this session" #~ msgstr "该会话没有命令记录" -#~ msgid "Login from" -#~ msgstr "登录来源" - #~ msgid "Replay session" #~ msgstr "回放会话" diff --git a/apps/terminal/api/session.py b/apps/terminal/api/session.py index f340147c3..bf0a69789 100644 --- a/apps/terminal/api/session.py +++ b/apps/terminal/api/session.py @@ -44,7 +44,7 @@ class SessionViewSet(OrgBulkModelViewSet): permission_classes = (IsOrgAdminOrAppUser, ) filter_fields = [ "user", "asset", "system_user", "remote_addr", - "protocol", "terminal", "is_finished", + "protocol", "terminal", "is_finished", 'login_from', ] date_range_filter_fields = [ ('date_start', ('date_from', 'date_to')) diff --git a/apps/terminal/migrations/0024_auto_20200715_1713.py b/apps/terminal/migrations/0024_auto_20200715_1713.py new file mode 100644 index 000000000..b99ad8d79 --- /dev/null +++ b/apps/terminal/migrations/0024_auto_20200715_1713.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.10 on 2020-07-15 09:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('terminal', '0023_command_risk_level'), + ] + + operations = [ + migrations.AlterField( + model_name='session', + name='login_from', + field=models.CharField(choices=[('ST', 'SSH Terminal'), ('WT', 'Web Terminal')], default='ST', max_length=2, verbose_name='Login from'), + ), + ] diff --git a/apps/terminal/models.py b/apps/terminal/models.py index a2dcbf8e0..f3914cc1c 100644 --- a/apps/terminal/models.py +++ b/apps/terminal/models.py @@ -188,7 +188,7 @@ class Session(OrgModelMixin): asset_id = models.CharField(blank=True, default='', max_length=36, db_index=True) system_user = models.CharField(max_length=128, verbose_name=_("System user"), db_index=True) system_user_id = models.CharField(blank=True, default='', max_length=36, db_index=True) - login_from = models.CharField(max_length=2, choices=LOGIN_FROM_CHOICES, default="ST") + login_from = models.CharField(max_length=2, choices=LOGIN_FROM_CHOICES, default="ST", verbose_name=_("Login from")) remote_addr = models.CharField(max_length=128, verbose_name=_("Remote addr"), blank=True, null=True) is_success = models.BooleanField(default=True, db_index=True) is_finished = models.BooleanField(default=False, db_index=True)