From d0d433db1a89701bc7b1fcae26044b28bae78de4 Mon Sep 17 00:00:00 2001
From: wangyong <864072399@qq.com>
Date: Tue, 30 Aug 2016 13:50:30 +0800
Subject: [PATCH] add asset_list

---
 apps/assets/templates/assets/asset_list.html | 38 ++++++++++----------
 apps/assets/urls.py                          |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index da5f2156f..61a56a406 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -6,7 +6,7 @@
         <div class="col-sm-12">
             <div class="ibox float-e-margins" id="all">
                 <div class="ibox-title">
-                    <h5> 主机详细信息列表</h5>
+                    <h5> 资产列表</h5>
                     <div class="ibox-tools">
                         <a class="collapse-link">
                             <i class="fa fa-chevron-up"></i>
@@ -102,14 +102,11 @@
                                         <input id="checkall" type="checkbox" class="i-checks" name="checkall" value="checkall" data-editable='false' onclick="check_all('asset_form')">
                                     </th>
                                     <th class="text-center"> 主机名 </th>
-                                    <th class="text-center" name="ip"> IP地址 </th>
-                                    <th class="text-center"> IDC </th>
-                                    <th class="text-center"> 所属主机组 </th>
-{#                                    <th class="text-center"> 配置信息 </th>#}
-                                    <th class="text-center"> 操作系统 </th>
-                                    <th class="text-center"> cpu核数 </th>
-                                    <th class="text-center"> 内存 </th>
-                                    <th class="text-center"> 硬盘 </th>
+                                    <th class="text-center" name="ip"> IP </th>
+                                    <th class="text-center"> 类型 </th>
+                                    <th class="text-center"> 配置 </th>
+                                    <th class="text-center"> 资产组 </th>
+                                    <th class="text-center"> 状态 </th>
                                     <th class="text-center"> 操作 </th>
                                 </tr>
                             </thead>
@@ -119,15 +116,18 @@
                                     <td class="text-center" name="id" value="{{ asset.id }}" data-editable='false'>
                                         <input name="id" value="{{ asset.id }}" type="checkbox" class="i-checks">
                                     </td>
-                                    <td class="text-center hostname"> <a href="{% url 'assets:asset-detail' %}/{{ asset.id }}">{{ asset.hostname|default_if_none:"" }}</a></td>
-                                    <td class="text-center"> {{ asset.ip|default_if_none:"" }} </td>
-                                    <td class="text-center"> {{ asset.idc.name|default_if_none:"" }} </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.system_type|default_if_none:"" }}{{ asset.system_version|default_if_none:"" }}</td>
-                                    <td class="text-center"> {{ asset.cpu|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 }}{% if asset.disk %}G{% endif %}</td>
+                                    <td class="text-center"> {{ asset.hostname }} </td>
+                                    <td class="text-center"> {{ asset.ip }} </td>
+                                    <td class="text-center">{{ asset.system_type }}</td>
+                                    <td class="text-center"> {{ asset.cpu }} | {{ asset.memory }} | {{ asset.disk }}</td>
+                                    <td class="text-center"> {% for group in asset.group.all %} {{ group.name }} {% endfor %}</td>
+                                    <td class="text-center">
+                                        {% if asset.is_active %}
+                                            <i class="fa fa-circle text-navy"></i>
+                                        {% else %}
+                                            <i class="fa fa-circle text-danger"></i>
+                                        {% 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>
@@ -145,7 +145,7 @@
 {#                                <input type="button" id="asset_update_all" class="btn btn-primary btn-sm"  name="update_button" value="更新全部"/>#}
                                 <input type="button" id="exec_cmd" class="btn btn-sm btn-primary"  name="exec_cmd" value="执行命令"/>
                             </div>
-{#                            {% include 'paginator.html' %}#}
+                            {% include '_pagination.html' %}
                         </div>
                     </form>
                 </div>
diff --git a/apps/assets/urls.py b/apps/assets/urls.py
index 6b19a7de6..184648cbe 100644
--- a/apps/assets/urls.py
+++ b/apps/assets/urls.py
@@ -6,7 +6,7 @@ app_name = 'assets'
 
 urlpatterns = [
     url(r'^add/$', AssetAddView.as_view(), name='asset-add'),
-    url(r'^list/$', AssetListView.as_view(), name='asset-list'),
+    url(r'^$', AssetListView.as_view(), name='asset-list'),
     url(r'^(?P<pk>[0-9]+)/delete/$', AssetDeleteView.as_view(), name='asset-list'),
     url(r'^(?P<pk>[0-9]+)/detail/$', AssetDetailView.as_view(), name='asset-detail'),
 ]