github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-07-02 07:01:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16639 from jumpserver/pr@dev@fix_protocol_error

Browse Source 
fix：In the import template, protocols are not required, but leaving them empty causes the asset import to fail.
This commit is contained in:
Crane.z
2026-07-02 14:17:42 +08:00
committed by GitHub
parent 87f3b2b380 cbde665ae6
commit eadd92463f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ __all__ = [
class AssetProtocolsSerializer(serializers.ModelSerializer):
port = serializers.IntegerField(required=False, allow_null=True, max_value=65535, min_value=0)
port = serializers.IntegerField(required=True, allow_null=True, max_value=65535, min_value=0)
def get_render_help_text(self):
if self.parent and self.parent.many:
@@ -145,7 +145,7 @@ class NodeDisplaySerializer(serializers.ListField):
class AssetSerializer(BulkOrgResourceModelSerializer, ResourceLabelsMixin, WritableNestedModelSerializer):
category = LabeledChoiceField(choices=Category.choices, read_only=True, label=_('Category'))
type = LabeledChoiceField(choices=AllTypes.choices(), read_only=True, label=_('Type'))
protocols = AssetProtocolsSerializer(many=True, required=False, label=_('Protocols'), default=())
protocols = AssetProtocolsSerializer(many=True, required=True, label=_('Protocols'))
accounts = AssetAccountSerializer(many=True, required=False, allow_null=True, write_only=True, label=_('Accounts'))
nodes_display = NodeDisplaySerializer(read_only=False, required=False, label=_("Node path"))
auto_config = serializers.DictField(read_only=True, label=_('Auto info'))