Merge "Move "Domain" field under "User Name" and "Password"" into stable/wallaby

This commit is contained in:
Zuul 2021-04-08 21:50:45 +00:00 committed by Gerrit Code Review
commit cf8c3ab26d
1 changed files with 2 additions and 4 deletions

View File

@ -89,10 +89,8 @@ class Login(django_auth_forms.AuthenticationForm):
else: else:
self.fields['domain'] = forms.CharField( self.fields['domain'] = forms.CharField(
initial=last_domain, initial=last_domain,
label=_("Domain"), label=_("Domain"))
widget=forms.TextInput(attrs={"autofocus": "autofocus"})) fields_ordering = ['username', 'password', 'domain', 'region']
self.fields['username'].widget = forms.widgets.TextInput()
fields_ordering = ['domain', 'username', 'password', 'region']
self.fields['region'].choices = get_region_choices() self.fields['region'].choices = get_region_choices()
if len(self.fields['region'].choices) == 1: if len(self.fields['region'].choices) == 1:
self.fields['region'].initial = self.fields['region'].choices[0][0] self.fields['region'].initial = self.fields['region'].choices[0][0]