From 7e2d627d3f1147dad3e3e9cd9bbb8fea4918f154 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 15 Jan 2018 18:14:58 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E8=B5=84=E4=BA=A7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=88=AB=E7=9A=84=E9=A1=B5=E4=BC=9A=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/asset_list.html | 16 ++++------------
 apps/static/js/jumpserver.js                 |  9 +++++++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 8fc20057f..625fc030d 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -31,8 +31,6 @@
             <th class="text-center">{% trans 'IP' %}</th>
             <th class="text-center">{% trans 'Port' %}</th>
             <th class="text-center">{% trans 'Cluster' %}</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 'Reachable' %}</th>
@@ -78,22 +76,16 @@ function initTable() {
                  $(td).html(rowData.cluster_name)
             }},
             {targets: 5, createdCell: function (td, cellData, rowData) {
-                 $(td).html(rowData.get_type_display)
-            }},
-            {targets: 6, createdCell: function (td, cellData, rowData) {
-                $(td).html(rowData.get_env_display)
-            }},
-            {targets: 7, createdCell: function (td, cellData, rowData) {
                 $(td).html(rowData.hardware_info)
             }},
-            {targets: 8, createdCell: function (td, cellData) {
+            {targets: 6, createdCell: function (td, cellData) {
                 if (!cellData) {
                     $(td).html('<i class="fa fa-times text-danger"></i>')
                 } else {
                     $(td).html('<i class="fa fa-check text-navy"></i>')
                 }
             }},
-            {targets: 9, createdCell: function (td, cellData) {
+            {targets: 7, createdCell: function (td, cellData) {
                 if (cellData == 'Unknown'){
                     $(td).html('<i class="fa fa-circle text-warning"></i>')
                 } else if (!cellData) {
@@ -102,7 +94,7 @@ function initTable() {
                     $(td).html('<i class="fa fa-circle text-navy"></i>')
                 }
             }},
-            {targets: 10, createdCell: function (td, cellData, rowData) {
+            {targets: 8, createdCell: function (td, cellData, rowData) {
                 var update_btn = '<a href="{% url "assets:asset-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace("{{ DEFAULT_PK }}", cellData);
                 var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_asset_delete" data-uid="{{ DEFAULT_PK }}">{% trans "Delete" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
                 $(td).html(update_btn + del_btn)
@@ -111,7 +103,7 @@ function initTable() {
         ajax_url: '{% url "api-assets:asset-list" %}',
         columns: [
             {data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" },
-            {data: "cluster"}, {data: "type" }, {data: "env"},
+            {data: "cluster"},
             {data: "cpu_cores"}, {data: "is_active", orderable: false },
             {data: "is_connective", orderable: false}, {data: "id", orderable: false }
         ],
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index 8be19b4a0..7b52c2b32 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -373,7 +373,6 @@ jumpserver.initServerSideDataTable = function (options) {
             url: options.ajax_url ,
             data: function (data) {
                 delete data.columns;
-                var length = data.length;
                 if (data.length !== null ){
                     data.limit = data.length;
                     delete data.length;
@@ -395,6 +394,12 @@ jumpserver.initServerSideDataTable = function (options) {
                     data.order = order;
                 }
             },
+            dataFilter: function(data){
+                var json = jQuery.parseJSON( data );
+                json.recordsTotal = json.count;
+                json.recordsFiltered = json.count;
+                return JSON.stringify(json); // return JSON string
+            },
             dataSrc: "results"
         },
         columns: options.columns || [],
@@ -414,7 +419,7 @@ jumpserver.initServerSideDataTable = function (options) {
                 last:       "»"
             }
         },
-        lengthMenu: [[15, 25, 50, -1], [15, 25, 50, "All"]]
+        lengthMenu: [[15, 25, 50], [15, 25, 50]]
     });
     table.on('select', function(e, dt, type, indexes) {
         var $node = table[ type ]( indexes ).nodes().to$();