From a57adf9b2e8d6a6ea8b69ab4bd5f771b9e25b23c Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 2 Nov 2014 23:11:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=BF=87=E6=BB=A4=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/AutoSa/AutoSa/views.py          | 2 +-
 webroot/AutoSa/templates/logView.html   | 2 ++
 webroot/AutoSa/templatetags/__init__.py | 0
 webroot/AutoSa/templatetags/mytags.py   | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 webroot/AutoSa/templatetags/__init__.py

diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index 064319f44..45509baed 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -957,7 +957,7 @@ def downFile(request):
 @admin_required
 def logView(request):
     thirtyDayAgo = (datetime.datetime.now() - datetime.timedelta(30))
-    thirtyDayAgoStamp = int(thirtyDayAgo.timetuple())
+    thirtyDayAgoStamp = int(time.mktime(thirtyDayAgo.timetuple()))
     logs_all = Logs.objects.filter(start_time__gt=thirtyDayAgoStamp)
     paginator = Paginator(logs_all, 20)
 
diff --git a/webroot/AutoSa/templates/logView.html b/webroot/AutoSa/templates/logView.html
index 88f2b85e9..6c29d824d 100644
--- a/webroot/AutoSa/templates/logView.html
+++ b/webroot/AutoSa/templates/logView.html
@@ -1,4 +1,6 @@
 {% extends 'base.html' %}
+{% load mytags %}
+
 {% block content %}
     <form method="post" action="">
         <table class="table table-striped table-hover table-condensed">
diff --git a/webroot/AutoSa/templatetags/__init__.py b/webroot/AutoSa/templatetags/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/webroot/AutoSa/templatetags/mytags.py b/webroot/AutoSa/templatetags/mytags.py
index e59f4095b..49581a9a8 100644
--- a/webroot/AutoSa/templatetags/mytags.py
+++ b/webroot/AutoSa/templatetags/mytags.py
@@ -4,7 +4,7 @@ from django import template
 register = template.Library
 
 
-@register.filter('stamp2str')
+@register.filter(name='stamp2str')
 def stamp2str(value):
     try:
         return time.strftime('%Y/%m/%d %H:%M:%S',time.localtime(value))