github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-17 00:11:42 +00:00
Code Issues Projects Releases Wiki Activity

fix: 解决lina不显示json格式参数，优化DictSerializer改为JSONSerialzer，

Browse Source
This commit is contained in:
jiangweidong 2023-06-08 10:06:14 +08:00 committed by Jiangjie.Bai
parent bfd77aa1b0
commit f0c0ba3653
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/serializers/auth/cas.py
View File

@ -25,5 +25,5 @@ class CASSettingSerializer(serializers.Serializer):
CAS_APPLY_ATTRIBUTES_TO_USER = serializers.BooleanField( CAS_APPLY_ATTRIBUTES_TO_USER = serializers.BooleanField(
required=False, label=_('Enable attributes map') required=False, label=_('Enable attributes map')
) )
CAS_RENAME_ATTRIBUTES = serializers.DictField(required=False, label=_('Rename attr')) CAS_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('Rename attr'))
CAS_CREATE_USER = serializers.BooleanField(required=False, label=_('Create user if not')) CAS_CREATE_USER = serializers.BooleanField(required=False, label=_('Create user if not'))

2
apps/settings/serializers/auth/ldap.py
View File

@ -54,7 +54,7 @@ class LDAPSettingSerializer(serializers.Serializer):
max_length=1024, required=True, label=_('User search filter'), max_length=1024, required=True, label=_('User search filter'),
help_text=_('Choice may be (cn|uid|sAMAccountName)=%(user)s)') help_text=_('Choice may be (cn|uid|sAMAccountName)=%(user)s)')
) )
AUTH_LDAP_USER_ATTR_MAP = serializers.DictField( AUTH_LDAP_USER_ATTR_MAP = serializers.JSONField(
required=True, label=_('User attr map'), required=True, label=_('User attr map'),
help_text=_('User attr map present how to map LDAP user attr to ' help_text=_('User attr map present how to map LDAP user attr to '
'jumpserver, username,name,email is jumpserver attr') 'jumpserver, username,name,email is jumpserver attr')

2
apps/settings/serializers/auth/oauth2.py
View File

@ -52,7 +52,7 @@ class OAuth2SettingSerializer(serializers.Serializer):
required=False, allow_blank=True, max_length=1024, label=_('Provider end session endpoint') required=False, allow_blank=True, max_length=1024, label=_('Provider end session endpoint')
) )
AUTH_OAUTH2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely')) AUTH_OAUTH2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely'))
AUTH_OAUTH2_USER_ATTR_MAP = serializers.DictField( AUTH_OAUTH2_USER_ATTR_MAP = serializers.JSONField(
required=True, label=_('User attr map') required=True, label=_('User attr map')
) )
AUTH_OAUTH2_ALWAYS_UPDATE_USER = serializers.BooleanField( AUTH_OAUTH2_ALWAYS_UPDATE_USER = serializers.BooleanField(

2
apps/settings/serializers/auth/oidc.py
View File

@ -33,7 +33,7 @@ class CommonSettingSerializer(serializers.Serializer):
AUTH_OPENID_IGNORE_SSL_VERIFICATION = serializers.BooleanField( AUTH_OPENID_IGNORE_SSL_VERIFICATION = serializers.BooleanField(
required=False, label=_('Ignore ssl verification') required=False, label=_('Ignore ssl verification')
) )
AUTH_OPENID_USER_ATTR_MAP = serializers.DictField( AUTH_OPENID_USER_ATTR_MAP = serializers.JSONField(
required=True, label=_('User attr map'), required=True, label=_('User attr map'),
help_text=_('User attr map present how to map OpenID user attr to ' help_text=_('User attr map present how to map OpenID user attr to '
'jumpserver, username,name,email is jumpserver attr') 'jumpserver, username,name,email is jumpserver attr')

2
apps/settings/serializers/auth/saml2.py
View File

@ -30,6 +30,6 @@ class SAML2SettingSerializer(serializers.Serializer):
allow_blank=True, required=False, allow_blank=True, required=False,
write_only=True, label=_('SP cert') write_only=True, label=_('SP cert')
) )
SAML2_RENAME_ATTRIBUTES = serializers.DictField(required=False, label=_('Rename attr')) SAML2_RENAME_ATTRIBUTES = serializers.JSONField(required=False, label=_('Rename attr'))
SAML2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely')) SAML2_LOGOUT_COMPLETELY = serializers.BooleanField(required=False, label=_('Logout completely'))
AUTH_SAML2_ALWAYS_UPDATE_USER = serializers.BooleanField(required=False, label=_('Always update user')) AUTH_SAML2_ALWAYS_UPDATE_USER = serializers.BooleanField(required=False, label=_('Always update user'))

2
apps/settings/serializers/auth/sms.py
View File

@ -96,7 +96,7 @@ class CustomSMSSettingSerializer(BaseSMSSettingSerializer):
post = 'post', 'Post' post = 'post', 'Post'
CUSTOM_SMS_URL = serializers.URLField(required=True, label=_("URL")) CUSTOM_SMS_URL = serializers.URLField(required=True, label=_("URL"))
CUSTOM_SMS_API_PARAMS = serializers.DictField( CUSTOM_SMS_API_PARAMS = serializers.JSONField(
label=_('Parameters'), default={'phone_number': '{phone_number}', 'code': '{code}'} label=_('Parameters'), default={'phone_number': '{phone_number}', 'code': '{code}'}
) )
CUSTOM_SMS_REQUEST_METHOD = serializers.ChoiceField( CUSTOM_SMS_REQUEST_METHOD = serializers.ChoiceField(