From f6c26a201ebf478f10a88d35146cf28dc617538d Mon Sep 17 00:00:00 2001
From: wangyong <864072399@qq.com>
Date: Wed, 30 Dec 2015 22:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A1=AC=E7=9B=98=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver/templatetags/mytags.py | 2 +-
 templates/jasset/asset_list.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py
index a5d70d801..42d42e4d0 100644
--- a/jumpserver/templatetags/mytags.py
+++ b/jumpserver/templatetags/mytags.py
@@ -292,7 +292,7 @@ def get_disk_info(disk_info):
         else:
             disk_size = ''
     except Exception:
-        disk_size = ''
+        disk_size = disk_info
     return disk_size
 
 
diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html
index 404be5ec0..56d64ce9b 100644
--- a/templates/jasset/asset_list.html
+++ b/templates/jasset/asset_list.html
@@ -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>