From 8cfec07faa4a952f646278afe07e16392f4bdc0c Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:21:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E5=9C=A8AWS?= =?UTF-8?q?=E5=85=AC=E6=9C=89=E4=BA=91=E7=8E=AF=E5=A2=83=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?rds=E7=AD=89=E8=B5=84=E4=BA=A7=E7=9A=84=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=95=BF=E5=BA=A6=E8=B6=85=E8=BF=87JumpServe?= =?UTF-8?q?r=E8=B5=84=E4=BA=A7=E9=99=90=E5=88=B6=E7=9A=84128=E5=AD=97?= =?UTF-8?q?=E8=8A=82=E5=AF=BC=E8=87=B4=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#11188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/terminal/serializers/session.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/terminal/serializers/session.py b/apps/terminal/serializers/session.py index 16c224950..6e5476c3e 100644 --- a/apps/terminal/serializers/session.py +++ b/apps/terminal/serializers/session.py @@ -2,6 +2,7 @@ from django.utils.translation import gettext_lazy as _ from rest_framework import serializers from common.serializers.fields import LabeledChoiceField +from common.utils import pretty_string from orgs.mixins.serializers import BulkOrgResourceModelSerializer from .terminal import TerminalSmallSerializer from ..const import SessionType @@ -22,6 +23,7 @@ class SessionSerializer(BulkOrgResourceModelSerializer): can_replay = serializers.BooleanField(read_only=True, label=_("Can replay")) can_join = serializers.BooleanField(read_only=True, label=_("Can join")) can_terminate = serializers.BooleanField(read_only=True, label=_("Can terminate")) + asset = serializers.CharField(label=_("Asset"), style={'base_template': 'textarea.html'}) class Meta: model = Session @@ -50,6 +52,11 @@ class SessionSerializer(BulkOrgResourceModelSerializer): 'terminal_display': {'label': _('Terminal display')}, } + def validate_asset(self, value): + max_length = self.Meta.model.asset.field.max_length + value = pretty_string(value, max_length=max_length) + return value + class SessionDisplaySerializer(SessionSerializer): command_amount = serializers.IntegerField(read_only=True, label=_('Command amount'))