From b52420708e29dc96e94174c92a2b6150c87d48e4 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Mon, 3 Nov 2014 10:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=87=EE=86=BD=E6=95=BC=20mytags=E6=B5=A3?=
 =?UTF-8?q?=E5=B6=87=E7=96=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/jumpserver.iml                                           | 2 +-
 webroot/AutoSa/AutoSa/settings.py                              | 1 +
 webroot/AutoSa/{UserManage => AutoSa}/templatetags/__init__.py | 0
 webroot/AutoSa/{UserManage => AutoSa}/templatetags/mytags.py   | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename webroot/AutoSa/{UserManage => AutoSa}/templatetags/__init__.py (100%)
 rename webroot/AutoSa/{UserManage => AutoSa}/templatetags/mytags.py (73%)

diff --git a/.idea/jumpserver.iml b/.idea/jumpserver.iml
index 94e54876c..9dcd47829 100644
--- a/.idea/jumpserver.iml
+++ b/.idea/jumpserver.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 2.7.8 (C:\Python27\python.exe)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 2.7.6 (C:/Python27/python.exe)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/webroot/AutoSa/AutoSa/settings.py b/webroot/AutoSa/AutoSa/settings.py
index ad040ae86..cbd7561f6 100644
--- a/webroot/AutoSa/AutoSa/settings.py
+++ b/webroot/AutoSa/AutoSa/settings.py
@@ -48,6 +48,7 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'UserManage',
     'Assets',
+    'AutoSa',
     #'RunCommand',
 )
 
diff --git a/webroot/AutoSa/UserManage/templatetags/__init__.py b/webroot/AutoSa/AutoSa/templatetags/__init__.py
similarity index 100%
rename from webroot/AutoSa/UserManage/templatetags/__init__.py
rename to webroot/AutoSa/AutoSa/templatetags/__init__.py
diff --git a/webroot/AutoSa/UserManage/templatetags/mytags.py b/webroot/AutoSa/AutoSa/templatetags/mytags.py
similarity index 73%
rename from webroot/AutoSa/UserManage/templatetags/mytags.py
rename to webroot/AutoSa/AutoSa/templatetags/mytags.py
index 155c26ae9..b267711b0 100644
--- a/webroot/AutoSa/UserManage/templatetags/mytags.py
+++ b/webroot/AutoSa/AutoSa/templatetags/mytags.py
@@ -7,6 +7,6 @@ register = template.Library()
 @register.filter(name='stamp2str')
 def stamp2str(value):
     try:
-        return time.strftime('%Y/%m/%d %H:%M:%S',time.localtime(value))
+        return time.strftime('%Y/%m/%d %H:%M:%S', time.localtime(value))
     except AttributeError:
         return '0000/00/00 00:00:00'