github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: GPT资产修改节点导致资产协议变多 (#11021) 

Co-authored-by: feng <1304903146@qq.com>
pull/11022/head
fit2bot 2023-07-19 19:00:15 +08:00 committed by GitHub
parent 046342ceee
commit de4ef7d1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/assets/serializers/asset/common.py
View File

@ -167,10 +167,9 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali
return return
protocols_required, protocols_default = self._get_protocols_required_default() protocols_required, protocols_default = self._get_protocols_required_default()
protocols_data = [ protocol_map = {str(protocol.id): protocol for protocol in protocols_required + protocols_default}
{'name': p.name, 'port': p.port} protocols = list(protocol_map.values())
for p in protocols_required + protocols_default protocols_data = [{'name': p.name, 'port': p.port} for p in protocols]
]
self.initial_data['protocols'] = protocols_data self.initial_data['protocols'] = protocols_data
def _init_field_choices(self): def _init_field_choices(self):
@ -263,7 +262,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali
error = p.get('name') + ': ' + _("port out of range (0-65535)") error = p.get('name') + ': ' + _("port out of range (0-65535)")
raise serializers.ValidationError(error) raise serializers.ValidationError(error)
protocols_required, protocols_default = self._get_protocols_required_default() protocols_required, __ = self._get_protocols_required_default()
protocols_not_found = [p.name for p in protocols_required if p.name not in protocols_data_map] protocols_not_found = [p.name for p in protocols_required if p.name not in protocols_data_map]
if protocols_not_found: if protocols_not_found:
raise serializers.ValidationError({ raise serializers.ValidationError({