github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

修改 mytags位置

pull/2/head
guanghongwei 2014-11-03 10:45:43 +08:00
parent 5bc67ebad9
commit b52420708e
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/jumpserver.iml
View File

@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4"> <module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" /> <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" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

1
webroot/AutoSa/AutoSa/settings.py
View File

@ -48,6 +48,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'UserManage', 'UserManage',
'Assets', 'Assets',
'AutoSa',
#'RunCommand', #'RunCommand',
) )

0
webroot/AutoSa/UserManage/templatetags/__init__.py → webroot/AutoSa/AutoSa/templatetags/__init__.py
View File

2
webroot/AutoSa/UserManage/templatetags/mytags.py → webroot/AutoSa/AutoSa/templatetags/mytags.py
View File

@ -7,6 +7,6 @@ register = template.Library()
@register.filter(name='stamp2str') @register.filter(name='stamp2str')
def stamp2str(value): def stamp2str(value):
try: 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: except AttributeError:
return '0000/00/00 00:00:00' return '0000/00/00 00:00:00'