From d2ad10af9a8cda61577aea9fca2ad071bfbf6aaa Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 31 Jan 2018 17:04:15 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_group_detail.html | 6 +++---
 apps/assets/templates/assets/cluster_assets.html     | 6 +++---
 apps/assets/templates/assets/user_asset_list.html    | 5 +----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/apps/assets/templates/assets/asset_group_detail.html b/apps/assets/templates/assets/asset_group_detail.html
index dda393e0d..16810a0c8 100644
--- a/apps/assets/templates/assets/asset_group_detail.html
+++ b/apps/assets/templates/assets/asset_group_detail.html
@@ -50,7 +50,6 @@
                                                 <th>{% trans 'Hostname' %}</th>
                                                 <th>{% trans 'IP' %}</th>
                                                 <th>{% trans 'Port' %}</th>
-	                                            <th>{% trans 'Type' %}</th>
                                                 <th>{% trans 'Alive' %}</th>
 	                                            <th>{% trans 'Action' %}</th>
                                             </tr>
@@ -180,8 +179,9 @@ function initTable() {
 			}}
 		],
 		ajax_url: '{% url "api-assets:asset-list" %}?asset_group_id={{ asset_group.id }}',
-		columns: [{data: "hostname" }, {data: "ip" }, {data: "port" },
-			{data: "get_type_display" }, {data: "is_connective" }, {data: "id"}],
+		columns: [
+		    {data: "hostname" }, {data: "ip" }, {data: "port" },
+			{data: "is_connective" }, {data: "id"}],
 		op_html: $('#actions').html()
 	};
 	jumpserver.initServerSideDataTable(options);
diff --git a/apps/assets/templates/assets/cluster_assets.html b/apps/assets/templates/assets/cluster_assets.html
index b2e33e578..4eb9dec63 100644
--- a/apps/assets/templates/assets/cluster_assets.html
+++ b/apps/assets/templates/assets/cluster_assets.html
@@ -51,7 +51,6 @@
                                                 <th>{% trans 'Hostname' %}</th>
                                                 <th>{% trans 'IP' %}</th>
                                                 <th>{% trans 'Port' %}</th>
-	                                            <th>{% trans 'Type' %}</th>
                                                 <th>{% trans 'Alive' %}</th>
 	                                            <th>{% trans 'Action' %}</th>
                                             </tr>
@@ -172,8 +171,9 @@ function initTable() {
 			}}
 		],
 		ajax_url: '{% url "api-assets:asset-list" %}?cluster_id={{ cluster.id }}',
-		columns: [{data: "hostname" }, {data: "ip" }, {data: "port" },
-			{data: "get_type_display" }, {data: "is_connective" }, {data: "id"}],
+		columns: [
+		    {data: "hostname" }, {data: "ip" }, {data: "port" },
+			{data: "is_connective" }, {data: "id"}],
 		op_html: $('#actions').html()
 	};
 	jumpserver.initServerSideDataTable(options);
diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html
index 4a91d4f65..31581f3c3 100644
--- a/apps/assets/templates/assets/user_asset_list.html
+++ b/apps/assets/templates/assets/user_asset_list.html
@@ -19,8 +19,6 @@
             <th class="text-center">{% trans 'Hostname' %}</th>
             <th class="text-center">{% trans 'IP' %}</th>
             <th class="text-center">{% trans 'Port' %}</th>
-            <th class="text-center">{% trans 'Type' %}</th>
-            <th class="text-center">{% trans 'Env' %}</th>
             <th class="text-center">{% trans 'Hardware' %}</th>
             <th class="text-center">{% trans 'Active' %}</th>
             <th class="text-center">{% trans 'Connective' %}</th>
@@ -68,8 +66,7 @@ function initTable() {
         ajax_url: '{% url "api-assets:user-asset-list" %}',
         columns: [
             {data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" },
-            {data: "get_type_display" }, {data: "get_env_display"}, {data: "hardware_info"},
-            {data: "is_active" }, {data: "is_connective"}
+            {data: "hardware_info"}, {data: "is_active" }, {data: "is_connective"}
         ],
         op_html: $('#actions').html()
     };