Skip to content

J
jumpserver
Commit 9b7ef113 authored by wangyong's avatar wangyong
Browse files
Options

fix bugs

parent 255e3a04
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
templates/jasset/asset_list.html
View file @ 9b7ef113
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<td class="text-center">{{ asset.group.all|group_str2 }}</td> <td class="text-center">{{ asset.group.all|group_str2 }}</td>
{# <td class="text-center">{{ asset.cpu }}|{{ asset.memory }}|{{ asset.disk }}</td>#} {# <td class="text-center">{{ asset.cpu }}|{{ asset.memory }}|{{ asset.disk }}</td>#}
<td class="text-center">{{ asset.system_type|default_if_none:"" }}{{ asset.system_version|default_if_none:"" }}</td> <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 }} </td> <td class="text-center"> {{ asset.cpu }} </td>
<td class="text-center"> {{ asset.memory }}{% if asset.memory %}G{% endif %}</td> <td class="text-center"> {{ asset.memory }}{% 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.memory %}G{% endif %}</td>
<td class="text-center" data-editable='false'> <td class="text-center" data-editable='false'>
......
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