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

Bugfix (#2506)

Browse Source 
* [Update] 增加清理celery日志

* [Update] 修复两周前会话命令数量系那是问题

* [Update] 修复两周前会话命令数量系那是问题

* [Update] 修改结构

* [Update] 添加datatable失败的日志

* [Update] 转换配置文件格式

* [Update] 添加traceback
This commit is contained in:
老广
2019-03-18 11:34:13 +08:00
committed by GitHub
parent 01745ead1f
commit 324cf2469f
30 changed files with 171 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/terminal/backends/command/db.py
View File

@@ -66,10 +66,14 @@ class CommandStore(CommandBase):
date_from_default = timezone.now() - datetime.timedelta(days=7)
date_to_default = timezone.now()
date_from = date_from if date_from else date_from_default
date_to = date_to if date_to else date_to_default
filter_kwargs['timestamp__gte'] = int(date_from.timestamp())
filter_kwargs['timestamp__lte'] = int(date_to.timestamp())
if not date_from and not session:
date_from = date_from_default
if not date_to and not session:
date_to = date_to_default
if date_from is not None:
filter_kwargs['timestamp__gte'] = int(date_from.timestamp())
if date_to is not None:
filter_kwargs['timestamp__lte'] = int(date_to.timestamp())
if user:
filter_kwargs["user"] = user