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 @@ - + 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'