github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-17 15:59:04 +00:00
Code Issues Projects Releases Wiki Activity

fix disk detail bug

Browse Source
This commit is contained in:
wangyong
2015-11-24 19:04:16 +08:00
parent d7cb549eac
commit 0262d94dd3
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jumpserver.conf
View File

@@ -13,7 +13,7 @@ password = mysql234
database = jumpserver
[websocket]
web_socket_host = j:3000
web_socket_host = js:3000
[mail]
mail_enable = 1

6
jumpserver/templatetags/mytags.py
View File

@@ -209,7 +209,11 @@ def str_to_dic(info):
"""
str to list
"""
return ast.literal_eval(info).iteritems()
if '{' in info:
info_dic = ast.literal_eval(info).iteritems()
else:
info_dic = {}
return info_dic
@register.filter(name='str_to_code')

6
templates/jasset/asset_edit.html
View File

@@ -96,15 +96,15 @@
<div class="hr-line-dashed"></div>
{{ af.memory|bootstrap_horizontal }}
<div class="hr-line-dashed"></div>
{{ af.disk|bootstrap_horizontal }}
<div class="hr-line-dashed"></div>
{{ af.system_type|bootstrap_horizontal }}
<div class="hr-line-dashed"></div>
{{ af.system_version|bootstrap_horizontal }}
<div class="hr-line-dashed"></div>
{{ af.disk|bootstrap_horizontal }}
<div class="hr-line-dashed"></div>
{{ af.number|bootstrap_horizontal }}