github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3395 from jumpserver/dev_loginlog 

[Update] 登录日志导出按照组织进行过滤
pull/3397/head
BaiJiangJie 2019-10-29 12:30:56 +08:00 committed by GitHub
parent 4e1e60046a ff62968bf6
commit c29381e657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/audits/models.py
View File

@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _
from django.utils import timezone from django.utils import timezone
from orgs.mixins.models import OrgModelMixin from orgs.mixins.models import OrgModelMixin
from orgs.utils import current_org
__all__ = [ __all__ = [
'FTPLog', 'OperateLog', 'PasswordChangeLog', 'UserLoginLog', 'FTPLog', 'OperateLog', 'PasswordChangeLog', 'UserLoginLog',
@ -104,6 +105,9 @@ class UserLoginLog(models.Model):
Q(city__contains=keyword) | Q(city__contains=keyword) |
Q(username__contains=keyword) Q(username__contains=keyword)
) )
if not current_org.is_root():
username_list = current_org.get_org_members().values_list('username', flat=True)
login_logs = login_logs.filter(username__in=username_list)
return login_logs return login_logs
class Meta: class Meta: