Commit 31280a38 authored by ibuler's avatar ibuler

Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

parents 70a4f137 ad3524f9
......@@ -6,6 +6,7 @@ from common import utils
TYPE_ENGINE_MAPPING = {
'elasticsearch': 'terminal.backends.command.es',
'es': 'terminal.backends.command.es',
}
......
# -*- coding: utf-8 -*-
#
from datetime import datetime
from jms_storage.es import ESStorage
from .base import CommandBase
from .models import AbstractSessionCommand
......@@ -14,6 +15,13 @@ class CommandStore(ESStorage, CommandBase):
user=None, asset=None, system_user=None,
input=None, session=None):
if date_from is not None:
if isinstance(date_from, float):
date_from = datetime.fromtimestamp(date_from)
if date_to is not None:
if isinstance(date_to, float):
date_to = datetime.fromtimestamp(date_to)
data = super().filter(date_from=date_from, date_to=date_to,
user=user, asset=asset, system_user=system_user,
input=input, session=session)
......
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