mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-05 01:11:57 +00:00
merge: into dev from v4
This commit is contained in:
@@ -19,7 +19,7 @@ class AnnouncementSerializer(serializers.Serializer):
|
||||
CONTENT = serializers.CharField(label=_("Content"))
|
||||
LINK = serializers.URLField(
|
||||
required=False, allow_null=True, allow_blank=True,
|
||||
label=_("More url"), default='',
|
||||
label=_("More URL"), default='',
|
||||
)
|
||||
|
||||
def to_representation(self, instance):
|
||||
@@ -35,7 +35,7 @@ class AnnouncementSerializer(serializers.Serializer):
|
||||
class AnnouncementSettingSerializer(serializers.Serializer):
|
||||
PREFIX_TITLE = _('Announcement')
|
||||
|
||||
ANNOUNCEMENT_ENABLED = serializers.BooleanField(label=_('Enable announcement'), default=True)
|
||||
ANNOUNCEMENT_ENABLED = serializers.BooleanField(label=_('Announcement'), default=True)
|
||||
ANNOUNCEMENT = AnnouncementSerializer(label=_("Announcement"))
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ class VaultSettingSerializer(serializers.Serializer):
|
||||
PREFIX_TITLE = _('HCP Vault')
|
||||
|
||||
VAULT_ENABLED = serializers.BooleanField(
|
||||
required=False, label=_('Enable Vault'), read_only=True
|
||||
required=False, label=_('Vault'), read_only=True
|
||||
)
|
||||
VAULT_HCP_HOST = serializers.CharField(
|
||||
max_length=256, allow_blank=True, required=False, label=_('Host')
|
||||
@@ -72,7 +72,7 @@ class ChatAISettingSerializer(serializers.Serializer):
|
||||
GPT_MODEL_CHOICES = []
|
||||
|
||||
CHAT_AI_ENABLED = serializers.BooleanField(
|
||||
required=False, label=_('Enable Chat AI')
|
||||
required=False, label=_('Chat AI')
|
||||
)
|
||||
GPT_BASE_URL = serializers.CharField(
|
||||
allow_blank=True, required=False, label=_('Base Url')
|
||||
@@ -112,11 +112,11 @@ class TicketSettingSerializer(serializers.Serializer):
|
||||
TICKETS_DIRECT_APPROVE = serializers.BooleanField(required=False, default=False, label=_("No login approval"))
|
||||
TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField(
|
||||
min_value=1, max_value=999999, required=False,
|
||||
label=_("Ticket authorize default time")
|
||||
label=_("Default period")
|
||||
)
|
||||
TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = serializers.ChoiceField(
|
||||
choices=[('day', _("day")), ('hour', _("hour"))],
|
||||
label=_("Ticket authorize default time unit"), required=False,
|
||||
label=_("Default unit"), required=False,
|
||||
)
|
||||
|
||||
|
||||
@@ -124,12 +124,12 @@ class OpsSettingSerializer(serializers.Serializer):
|
||||
PREFIX_TITLE = _('Feature')
|
||||
|
||||
SECURITY_COMMAND_EXECUTION = serializers.BooleanField(
|
||||
required=False, label=_('Operation center'),
|
||||
required=False, label=_('Job center'),
|
||||
help_text=_('Allow user run batch command or not using ansible')
|
||||
)
|
||||
SECURITY_COMMAND_BLACKLIST = serializers.ListField(
|
||||
child=serializers.CharField(max_length=1024, ),
|
||||
label=_('Operation center command blacklist'),
|
||||
label=_('Command blacklist'),
|
||||
help_text=_("Commands that are not allowed execute.")
|
||||
)
|
||||
|
||||
@@ -138,5 +138,5 @@ class VirtualAppSerializer(serializers.Serializer):
|
||||
PREFIX_TITLE = _('Virtual app')
|
||||
|
||||
VIRTUAL_APP_ENABLED = serializers.BooleanField(
|
||||
required=False, label=_('Enable virtual app'),
|
||||
required=False, label=_('Virtual app'),
|
||||
)
|
||||
|
Reference in New Issue
Block a user