Commit 0262d94d authored by wangyong's avatar wangyong

fix disk detail bug

parent d7cb549e
...@@ -13,7 +13,7 @@ password = mysql234 ...@@ -13,7 +13,7 @@ password = mysql234
database = jumpserver database = jumpserver
[websocket] [websocket]
web_socket_host = j:3000 web_socket_host = js:3000
[mail] [mail]
mail_enable = 1 mail_enable = 1
......
...@@ -209,7 +209,11 @@ def str_to_dic(info): ...@@ -209,7 +209,11 @@ def str_to_dic(info):
""" """
str to list 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') @register.filter(name='str_to_code')
......
...@@ -97,13 +97,13 @@ ...@@ -97,13 +97,13 @@
{{ af.memory|bootstrap_horizontal }} {{ af.memory|bootstrap_horizontal }}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
{{ af.system_type|bootstrap_horizontal }} {{ af.disk|bootstrap_horizontal }}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
{{ af.system_version|bootstrap_horizontal }} {{ af.system_type|bootstrap_horizontal }}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
{{ af.disk|bootstrap_horizontal }} {{ af.system_version|bootstrap_horizontal }}
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
{{ af.number|bootstrap_horizontal }} {{ af.number|bootstrap_horizontal }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment