From 950358f5baa3716f151912cca06d968051a26904 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Tue, 22 Oct 2019 17:40:55 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/audits/models.py | 8 +++-----
apps/audits/views.py | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/apps/audits/models.py b/apps/audits/models.py
index 5220a032..31471edb 100644
--- a/apps/audits/models.py
+++ b/apps/audits/models.py
@@ -88,13 +88,11 @@ class UserLoginLog(models.Model):
datetime = models.DateTimeField(default=timezone.now, verbose_name=_('Date login'))
@classmethod
- def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None, date_format=None):
+ def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None):
login_logs = cls.objects.all()
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'
- )
+ date_from = "{} {}".format(date_from, '00:00:00')
+ date_to = "{} {}".format(date_to, '23:59:59')
login_logs = login_logs.filter(
datetime__gte=date_from, datetime__lte=date_to
)
diff --git a/apps/audits/views.py b/apps/audits/views.py
index 6934f2e9..480aa11a 100644
--- a/apps/audits/views.py
+++ b/apps/audits/views.py
@@ -282,7 +282,7 @@ class LoginLogExportView(PermissionsMixin, View):
login_logs = UserLoginLog.get_login_logs(
date_from=date_from, date_to=date_to, user=user,
- keyword=keyword, date_format=self.date_format
+ keyword=keyword,
)
except ValueError:
return HttpResponse('Json object not valid', status=400)
--
2.18.0