From 11fa3e08e967e324daaf5f04d14c6727eaaf2cdd Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 15 Dec 2017 17:08:22 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E6=94=B9ts=5Fto=5Fdate=20b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/templatetags/common_tags.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/common/templatetags/common_tags.py b/apps/common/templatetags/common_tags.py
index 324766aa7..2928726f4 100644
--- a/apps/common/templatetags/common_tags.py
+++ b/apps/common/templatetags/common_tags.py
@@ -57,7 +57,7 @@ def int_to_str(value):
 def ts_to_date(ts):
     try:
         ts = float(ts)
-    except ValueError:
+    except (TypeError, ValueError):
         ts = 0
     dt = timezone.datetime.fromtimestamp(ts).\
         replace(tzinfo=timezone.get_current_timezone())
@@ -67,8 +67,3 @@ def ts_to_date(ts):
 @register.filter
 def to_html(s):
     return escape(s).replace('\n', '<br />')
-
-
-# @register.filter
-# def proxy_log_commands(log_id):
-#     return 1