Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

pull/7289/head
ibuler 2021-11-24 16:15:57 +08:00
commit 9dd93ea3b8
2 changed files with 4 additions and 3 deletions

View File

@ -43,8 +43,8 @@ class UserLoginForm(forms.Form):
class UserCheckOtpCodeForm(forms.Form):
code = forms.CharField(label=_('MFA Code'), max_length=6, required=False)
mfa_type = forms.CharField(label=_('MFA type'), max_length=6)
code = forms.CharField(label=_('MFA Code'), max_length=128, required=False)
mfa_type = forms.CharField(label=_('MFA type'), max_length=128)
class CustomCaptchaTextInput(CaptchaTextInput):
@ -57,7 +57,7 @@ class CaptchaMixin(forms.Form):
class ChallengeMixin(forms.Form):
challenge = forms.CharField(
label=_('MFA code'), max_length=6, required=False,
label=_('MFA code'), max_length=128, required=False,
widget=forms.TextInput(attrs={
'placeholder': _("Dynamic code"),
'style': 'width: 50%'

View File

@ -120,3 +120,4 @@ psycopg2-binary==2.9.1
alibabacloud_dysmsapi20170525==2.0.2
geoip2==4.4.0
html2text==2020.1.16
python-novaclient==11.0.1