mirror of https://github.com/jumpserver/jumpserver
				
				
				
			feat(session + db): 会话搜索添加登录来源选项
							parent
							
								
									c0f3a1f64a
								
							
						
					
					
						commit
						4e933fc1ca
					
				
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -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 <ibuler@qq.com>\n"
 | 
			
		||||
"Language-Team: JumpServer team<ibuler@qq.com>\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 "回放会话"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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'))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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'),
 | 
			
		||||
        ),
 | 
			
		||||
    ]
 | 
			
		||||
| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue