github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-21 11:28:38 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00，到结束时间的23:59:59

Browse Source
This commit is contained in:
jym503558564
2019-10-22 16:17:42 +08:00
parent 334e3bef0e
commit f4fc757379
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/audits/models.py
View File

@@ -88,11 +88,15 @@ class UserLoginLog(models.Model):
datetime = models.DateTimeField(default=timezone.now, verbose_name=_('Date login'))
@classmethod
def get_login_logs(cls, date_form=None, date_to=None, user=None, keyword=None):
def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None, date_format=None):
login_logs = cls.objects.all()
if date_form and date_to:
if date_from and date_to:
date_from = timezone.datetime.strptime(date_from, date_format)
date_to = timezone.datetime.strptime(
date_to + ' 23:59:59', date_format + ' %H:%M:%S'
)
login_logs = login_logs.filter(
datetime__gt=date_form, datetime__lt=date_to
datetime__gte=date_from, datetime__lte=date_to
)
if user:
login_logs = login_logs.filter(username=user)