From 676e4d5497955bd16b06411c02875683bc312621 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 1 Dec 2012 12:17:00 +0100 Subject: [PATCH] [1.5.x] Fixed #19349 -- Fixed re-rendering of ReadOnlyPasswordHashWidget Thanks tim.bowden at mapforge.com.au for the report, Andreas Hug for the patch and Anton Baklanov for the review. Backport of a0cd6dd11 from master. --- django/contrib/auth/forms.py | 7 ++++++- django/contrib/auth/tests/forms.py | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 10d9eca3c3d..b44bc8b40bf 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -27,7 +27,7 @@ class ReadOnlyPasswordHashWidget(forms.Widget): encoded = value final_attrs = self.build_attrs(attrs) - if encoded == '' or encoded == UNUSABLE_PASSWORD: + if not encoded or encoded == UNUSABLE_PASSWORD: summary = mark_safe("%s" % ugettext("No password set.")) else: try: @@ -52,6 +52,11 @@ class ReadOnlyPasswordHashField(forms.Field): kwargs.setdefault("required", False) super(ReadOnlyPasswordHashField, self).__init__(*args, **kwargs) + def bound_data(self, data, initial): + # Always return initial because the widget doesn't + # render an input field. + return initial + class UserCreationForm(forms.ModelForm): """ diff --git a/django/contrib/auth/tests/forms.py b/django/contrib/auth/tests/forms.py index f3eb24287e8..286652ebcc0 100644 --- a/django/contrib/auth/tests/forms.py +++ b/django/contrib/auth/tests/forms.py @@ -3,7 +3,8 @@ from __future__ import unicode_literals import os from django.contrib.auth.models import User from django.contrib.auth.forms import (UserCreationForm, AuthenticationForm, - PasswordChangeForm, SetPasswordForm, UserChangeForm, PasswordResetForm) + PasswordChangeForm, SetPasswordForm, UserChangeForm, PasswordResetForm, + ReadOnlyPasswordHashWidget) from django.contrib.auth.tests.utils import skipIfCustomUser from django.core import mail from django.forms.fields import Field, EmailField @@ -282,6 +283,14 @@ class UserChangeFormTest(TestCase): self.assertTrue(form.is_valid()) self.assertEqual(form.cleaned_data['password'], 'sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161') + def test_bug_19349_bound_password_field(self): + user = User.objects.get(username='testclient') + form = UserChangeForm(data={}, instance=user) + # When rendering the bound password field, + # ReadOnlyPasswordHashWidget needs the initial + # value to render correctly + self.assertEqual(form.initial['password'], form['password'].value()) + @skipIfCustomUser @override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) @@ -362,3 +371,13 @@ class PasswordResetFormTest(TestCase): self.assertFalse(form.is_valid()) self.assertEqual(form["email"].errors, [_("The user account associated with this email address cannot reset the password.")]) + + +class ReadOnlyPasswordHashWidgetTest(TestCase): + + def test_bug_19349_render_with_none_value(self): + # Rendering the widget with value set to None + # mustn't raise an exception. + widget = ReadOnlyPasswordHashWidget() + html = widget.render(name='password', value=None, attrs={}) + self.assertIn(_("No password set."), html)