github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-24 05:57:31 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 修改ts_to_date bug

Browse Source
This commit is contained in:
ibuler 2017-12-15 17:08:22 +08:00
parent 2d0be8f996
commit 11fa3e08e9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/common/templatetags/common_tags.py
View File

@ -57,7 +57,7 @@ def int_to_str(value):
def ts_to_date(ts): def ts_to_date(ts):
try: try:
ts = float(ts) ts = float(ts)
except ValueError: except (TypeError, ValueError):
ts = 0 ts = 0
dt = timezone.datetime.fromtimestamp(ts).\ dt = timezone.datetime.fromtimestamp(ts).\
replace(tzinfo=timezone.get_current_timezone()) replace(tzinfo=timezone.get_current_timezone())
@ -67,8 +67,3 @@ def ts_to_date(ts):
@register.filter @register.filter
def to_html(s): def to_html(s):
return escape(s).replace('\n', '<br />') return escape(s).replace('\n', '<br />')
# @register.filter
# def proxy_log_commands(log_id):
# return 1