Merge pull request #2976 from jumpserver/dev

[Update] 解决授权资产显示禁用资产的问题 (#2975)

apps/assets/serializers/asset.py

@@ -112,7 +112,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
             protocol = protocols_data[0].split('/')
             validated_data["protocol"] = protocol[0]
             validated_data["port"] = int(protocol[1])
-        if validated_data:
+        if protocols_data:
             validated_data["protocols"] = ' '.join(protocols_data)
 
     def create(self, validated_data):

apps/assets/serializers/base.py

 # -*- coding: utf-8 -*-
 #
 
+from django.utils.translation import ugettext as _
 from rest_framework import serializers
+
 from common.utils import ssh_pubkey_gen, validate_ssh_private_key
 
 

apps/assets/templates/assets/asset_create.html

@@ -216,6 +216,8 @@ $(document).ready(function () {
     var form = $("form");
     var protocols = {};
     var data = form.serializeObject();
+    objectAttrsIsBool(data, ['is_active']);
+    objectAttrsIsList(data, ['nodes', 'labels']);
     $.each(data, function (k, v) {
         if (k.startsWith("form")){
             delete data[k];
@@ -233,12 +235,6 @@ $(document).ready(function () {
         return v.name + '/' + v.port
     });
     data["protocols"] = protocols;
-    if (typeof data.labels === "string") {
-        data["labels"] = [data["labels"]];
-    }
-    if (typeof data["nodes"] == "string") {
-        data["nodes"] = [data["nodes"]]
-    }
     var props = {
         url: the_url,
         data: data,

apps/perms/utils/asset_permission.py

@@ -499,7 +499,7 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
         if pattern:
             assets_ids = Asset.objects.filter(
                 nodes__key__regex=pattern
-            ).values_list("id", flat=True).distinct()
+            ).valid().values_list("id", flat=True).distinct()
         else:
             assets_ids = []
         self.tree.add_assets_without_system_users(assets_ids)
@@ -523,8 +523,8 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
         assets_ids = defaultdict(lambda: defaultdict(int))
         for perm in self.permissions:
             actions = [perm.actions]
-            _assets_ids = [a.id for a in perm.assets.all()]
-            system_users_ids = [s.id for s in perm.system_users.all()]
+            _assets_ids = perm.assets.valid().values_list("id", flat=True)
+            system_users_ids = perm.system_users.values_list("id", flat=True)
             iterable = itertools.product(_assets_ids, system_users_ids, actions)
             for asset_id, sys_id, action in iterable:
                 assets_ids[asset_id][sys_id] |= action