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 @@ {% trans 'Hostname' %} {% trans 'IP' %} {% trans 'Port' %} - {% trans 'Type' %} {% trans 'Alive' %} {% trans 'Action' %} @@ -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 @@ {% trans 'Hostname' %} {% trans 'IP' %} {% trans 'Port' %} - {% trans 'Type' %} {% trans 'Alive' %} {% trans 'Action' %} @@ -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 @@ {% trans 'Hostname' %} {% trans 'IP' %} {% trans 'Port' %} - {% trans 'Type' %} - {% trans 'Env' %} {% trans 'Hardware' %} {% trans 'Active' %} {% trans 'Connective' %} @@ -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() };