mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-31 19:46:42 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #29270 -- Fixed UserChangeForm crash if password field is excluded.

Browse Source
This commit is contained in:
Malte Gerth 2018-03-29 11:35:53 +02:00 committed by Tim Graham
parent c59aa9e6aa
commit 874977d388
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,10 +137,12 @@ class UserChangeForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields['password'].help_text = self.fields['password'].help_text.format('../password/') password = self.fields.get('password')
f = self.fields.get('user_permissions') if password:
if f is not None: password.help_text = password.help_text.format('../password/')
f.queryset = f.queryset.select_related('content_type') user_permissions = self.fields.get('user_permissions')
if user_permissions:
user_permissions.queryset = user_permissions.queryset.select_related('content_type')
def clean_password(self): def clean_password(self):
# Regardless of what the user provides, return the initial value. # Regardless of what the user provides, return the initial value.

11
tests/auth_tests/test_forms.py
View File

@ -797,6 +797,17 @@ class UserChangeFormTest(ReloadFormsMixin, TestDataMixin, TestCase):
form = UserChangeForm(data, instance=user) form = UserChangeForm(data, instance=user)
self.assertTrue(form.is_valid()) self.assertTrue(form.is_valid())
def test_password_excluded(self):
class UserChangeFormWithoutPassword(UserChangeForm):
password = None
class Meta:
model = User
exclude = ['password']
form = UserChangeFormWithoutPassword()
self.assertNotIn('password', form.fields)
@override_settings(TEMPLATES=AUTH_TEMPLATES) @override_settings(TEMPLATES=AUTH_TEMPLATES)
class PasswordResetFormTest(TestDataMixin, TestCase): class PasswordResetFormTest(TestDataMixin, TestCase):