Unverified Commit c29381e6 authored by BaiJiangJie's avatar BaiJiangJie Committed by GitHub

Merge pull request #3395 from jumpserver/dev_loginlog

[Update] 登录日志导出按照组织进行过滤
parents 4e1e6004 ff62968b
...@@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _ ...@@ -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): ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment