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

修改硬盘不显示问题

pull/34/head
wangyong 2015-12-30 22:35:32 +08:00
parent 33da9fd143
commit f6c26a201e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jumpserver/templatetags/mytags.py
View File

@ -292,7 +292,7 @@ def get_disk_info(disk_info):
else:
disk_size = ''
except Exception:
disk_size = ''
disk_size = disk_info
return disk_size

2
templates/jasset/asset_list.html
View File

@ -129,7 +129,7 @@
<td class="text-center">{{ asset.system_type|default_if_none:"" }}{{ asset.system_version|default_if_none:"" }}</td>
<td class="text-center"> {{ asset.cpu|get_cpu_core|default_if_none:"" }} </td>
<td class="text-center"> {{ asset.memory|default_if_none:"" }}{% if asset.memory %}G{% endif %}</td>
<td class="text-center"> {{ asset.disk|get_disk_info }}{% if asset.memory %}G{% endif %}</td>
<td class="text-center"> {{ asset.disk|get_disk_info }}{% if asset.disk %}G{% endif %}</td>
<td class="text-center" data-editable='false'>
<a href="{% url 'asset_edit' %}?id={{ asset.id }}" class="btn btn-xs btn-info">编辑</a>
<a value="{{ asset.id }}" class="conn btn btn-xs btn-warning">连接</a>