mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-04 11:09:13 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #26097 -- Added password_validators_help_text_html to UserCreationForm.

Browse Source
This commit is contained in:
Alexander Gaevsky 2016-04-14 20:12:30 +03:00 committed by Tim Graham
parent 2d26b4637f
commit 536db42cf0
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/admin/static/admin/css/base.css
View File

@ -187,11 +187,15 @@ p.mini {
margin-top: -3px; margin-top: -3px;
} }
.help, p.help, form p.help, div.help, form div.help { .help, p.help, form p.help, div.help, form div.help, div.help li {
font-size: 11px; font-size: 11px;
color: #999; color: #999;
} }
div.help ul {
margin-bottom: 0;
}
.help-tooltip { .help-tooltip {
cursor: help; cursor: help;
} }

1
django/contrib/auth/forms.py
View File

@ -79,6 +79,7 @@ class UserCreationForm(forms.ModelForm):
label=_("Password"), label=_("Password"),
strip=False, strip=False,
widget=forms.PasswordInput, widget=forms.PasswordInput,
help_text=password_validation.password_validators_help_text_html(),
) )
password2 = forms.CharField( password2 = forms.CharField(
label=_("Password confirmation"), label=_("Password confirmation"),

3
docs/releases/1.11.txt
View File

@ -106,6 +106,9 @@ Minor features
:class:`~django.contrib.auth.views.LogoutView` allows specifying a set of :class:`~django.contrib.auth.views.LogoutView` allows specifying a set of
hosts that are safe for redirecting after login and logout. hosts that are safe for redirecting after login and logout.
* Added password validators ``help_text`` to
:class:`~django.contrib.auth.forms.UserCreationForm`.
:mod:`django.contrib.contenttypes` :mod:`django.contrib.contenttypes`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

10
tests/auth_tests/test_forms.py
View File

@ -236,6 +236,16 @@ class UserCreationFormTest(TestDataMixin, TestCase):
self.assertEqual(form.cleaned_data['password1'], data['password1']) self.assertEqual(form.cleaned_data['password1'], data['password1'])
self.assertEqual(form.cleaned_data['password2'], data['password2']) self.assertEqual(form.cleaned_data['password2'], data['password2'])
@override_settings(AUTH_PASSWORD_VALIDATORS=[
{'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
])
def test_password_help_text(self):
form = UserCreationForm()
self.assertEqual(
form.fields['password1'].help_text,
'<ul><li>Your password can&#39;t be too similar to your other personal information.</li></ul>'
)
# To verify that the login form rejects inactive users, use an authentication # To verify that the login form rejects inactive users, use an authentication
# backend that allows them. # backend that allows them.