[Bugfix] 修改bug，显示cluster

apps/assets/serializers.py

@@ -151,6 +151,8 @@ class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer):
     """
     资产的数据结构
     """
+    cluster_name = serializers.SerializerMethodField()
+
     class Meta(object):
         model = Asset
         list_serializer_class = BulkListSerializer
@@ -165,6 +167,10 @@ class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer):
         ])
         return fields
 
+    @staticmethod
+    def get_cluster_name(obj):
+        return obj.cluster.name
+
 
 class AssetGrantedSerializer(serializers.ModelSerializer):
     """

apps/assets/templates/assets/asset_list.html

@@ -30,6 +30,7 @@
             <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 'Cluster' %}</th>
             <th class="text-center">{% trans 'Type' %}</th>
             <th class="text-center">{% trans 'Env' %}</th>
             <th class="text-center">{% trans 'Hardware' %}</th>
@@ -74,14 +75,14 @@ function initTable() {
                 var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
                 $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
             }},
-            {targets: 7, createdCell: function (td, cellData) {
+            {targets: 8, 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: 8, createdCell: function (td, cellData) {
+            {targets: 9, createdCell: function (td, cellData) {
                 if (cellData == 'Unknown'){
                     $(td).html('<i class="fa fa-circle text-warning"></i>')
                 } else if (!cellData) {
@@ -90,14 +91,14 @@ function initTable() {
                     $(td).html('<i class="fa fa-circle text-navy"></i>')
                 }
             }},
-            {targets: 9, createdCell: function (td, cellData, rowData) {
+            {targets: 10, 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)
             }}
         ],
         ajax_url: '{% url "api-assets:asset-list" %}',
-        columns: [{data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" },
+        columns: [{data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" }, {data: "cluster_name"},
             {data: "get_type_display" }, {data: "get_env_display"}, {data: "hardware_info"},
             {data: "is_active" }, {data: "is_connective"}, {data: "id" }],
         op_html: $('#actions').html()

apps/assets/templates/assets/cluster_assets.html

@@ -181,7 +181,7 @@ function initTable() {
 }
 
 $(document).ready(function () {
-	$('.select2').select2();
+	$('.select2').select2()
 	.on("select2:select", function (evt) {
 		var data = evt.params.data;
 		jumpserver.assets_selected[data.id] = data.text;

apps/assets/templates/assets/system_user_asset.html

@@ -125,7 +125,7 @@ function initAssetsTable() {
 }
 
 $(document).ready(function () {
-	$('.select2').select2();
+	$('.select2').select2()
 	.on("select2:select", function (evt) {
 		var data = evt.params.data;
 		jumpserver.assets_selected[data.id] = data.text;

apps/assets/templates/assets/system_user_detail.html

@@ -212,7 +212,7 @@ function updateSystemUserCluster(clusters) {
 }
 jumpserver.cluster_selected = {};
 $(document).ready(function () {
-    $('.select2').select2();
+    $('.select2').select2()
     .on('select2:select', function(evt) {
             var data = evt.params.data;
             jumpserver.cluster_selected[data.id] = data.text;

apps/perms/templates/perms/asset_permission_detail.html

@@ -190,7 +190,7 @@ function updateSystemUser(system_users) {
 }
 
 $(document).ready(function () {
-    $('.select2').select2();
+    $('.select2').select2()
         .on('select2:select', function(evt) {
              var data = evt.params.data;
              jumpserver.system_users_selected[data.id] = data.text;

apps/users/templates/users/user_detail.html

@@ -253,7 +253,7 @@ function updateUserGroups(groups) {
 }
 
 $(document).ready(function() {
-    $('.select2').select2();
+    $('.select2').select2()
         .on('select2:select', function(evt) {
             var data = evt.params.data;
             jumpserver.groups_selected[data.id] = data.text;

apps/users/templates/users/user_group_detail.html

@@ -150,7 +150,7 @@ function updateGroupMember(users) {
 }
 
 $(document).ready(function () {
-   $('.select2').select2();
+   $('.select2').select2()
           .on('select2:select', function(evt) {
             var data = evt.params.data;
             jumpserver.users_selected[data.id] = data.text;