Fixed #20199 -- Allow ModelForm fields to override error_messages from model fields (ee77d4b2) · Commits · Dom Sekotill / django

django/contrib/admin/forms.py

+3 −6

Original line number	Diff line number	Diff line
		@@ -22,15 +22,12 @@ class AdminAuthenticationForm(AuthenticationForm):
		username = self.cleaned_data.get('username')
		password = self.cleaned_data.get('password')
		message = ERROR_MESSAGE
		params = {'username': self.username_field.verbose_name}

		if username and password:
		self.user_cache = authenticate(username=username, password=password)
		if self.user_cache is None:
		raise forms.ValidationError(message % {
		'username': self.username_field.verbose_name
		})
		raise forms.ValidationError(message, code='invalid', params=params)
		elif not self.user_cache.is_active or not self.user_cache.is_staff:
		raise forms.ValidationError(message % {
		'username': self.username_field.verbose_name
		})
		raise forms.ValidationError(message, code='invalid', params=params)
		return self.cleaned_data

django/contrib/admin/options.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -1574,13 +1574,13 @@ class InlineModelAdmin(BaseModelAdmin):
		'class_name': p._meta.verbose_name,
		'instance': p}
		)
		msg_dict = {'class_name': self._meta.model._meta.verbose_name,
		params = {'class_name': self._meta.model._meta.verbose_name,
		'instance': self.instance,
		'related_objects': get_text_list(objs, _('and'))}
		msg = _("Deleting %(class_name)s %(instance)s would require "
		"deleting the following protected related objects: "
		"%(related_objects)s") % msg_dict
		raise ValidationError(msg)
		"%(related_objects)s")
		raise ValidationError(msg, code='deleting_protected', params=params)

		def is_valid(self):
		result = super(DeleteProtectedModelForm, self).is_valid()

django/contrib/auth/forms.py

+24 −9

Original line number	Diff line number	Diff line
		@@ -97,14 +97,19 @@ class UserCreationForm(forms.ModelForm):
		User._default_manager.get(username=username)
		except User.DoesNotExist:
		return username
		raise forms.ValidationError(self.error_messages['duplicate_username'])
		raise forms.ValidationError(
		self.error_messages['duplicate_username'],
		code='duplicate_username',
		)

		def clean_password2(self):
		password1 = self.cleaned_data.get("password1")
		password2 = self.cleaned_data.get("password2")
		if password1 and password2 and password1 != password2:
		raise forms.ValidationError(
		self.error_messages['password_mismatch'])
		self.error_messages['password_mismatch'],
		code='password_mismatch',
		)
		return password2

		def save(self, commit=True):
		@@ -183,11 +188,15 @@ class AuthenticationForm(forms.Form):
		password=password)
		if self.user_cache is None:
		raise forms.ValidationError(
		self.error_messages['invalid_login'] % {
		'username': self.username_field.verbose_name
		})
		self.error_messages['invalid_login'],
		code='invalid_login',
		params={'username': self.username_field.verbose_name},
		)
		elif not self.user_cache.is_active:
		raise forms.ValidationError(self.error_messages['inactive'])
		raise forms.ValidationError(
		self.error_messages['inactive'],
		code='inactive',
		)
		return self.cleaned_data

		def check_for_test_cookie(self):
		@@ -269,7 +278,9 @@ class SetPasswordForm(forms.Form):
		if password1 and password2:
		if password1 != password2:
		raise forms.ValidationError(
		self.error_messages['password_mismatch'])
		self.error_messages['password_mismatch'],
		code='password_mismatch',
		)
		return password2

		def save(self, commit=True):
		@@ -298,7 +309,9 @@ class PasswordChangeForm(SetPasswordForm):
		old_password = self.cleaned_data["old_password"]
		if not self.user.check_password(old_password):
		raise forms.ValidationError(
		self.error_messages['password_incorrect'])
		self.error_messages['password_incorrect'],
		code='password_incorrect',
		)
		return old_password

		PasswordChangeForm.base_fields = SortedDict([
		@@ -329,7 +342,9 @@ class AdminPasswordChangeForm(forms.Form):
		if password1 and password2:
		if password1 != password2:
		raise forms.ValidationError(
		self.error_messages['password_mismatch'])
		self.error_messages['password_mismatch'],
		code='password_mismatch',
		)
		return password2

		def save(self, commit=True):

django/contrib/flatpages/forms.py

+12 −4

Original line number	Diff line number	Diff line
		@@ -17,11 +17,17 @@ class FlatpageForm(forms.ModelForm):
		def clean_url(self):
		url = self.cleaned_data['url']
		if not url.startswith('/'):
		raise forms.ValidationError(ugettext("URL is missing a leading slash."))
		raise forms.ValidationError(
		ugettext("URL is missing a leading slash."),
		code='missing_leading_slash',
		)
		if (settings.APPEND_SLASH and
		'django.middleware.common.CommonMiddleware' in settings.MIDDLEWARE_CLASSES and
		not url.endswith('/')):
		raise forms.ValidationError(ugettext("URL is missing a trailing slash."))
		raise forms.ValidationError(
		ugettext("URL is missing a trailing slash."),
		code='missing_trailing_slash',
		)
		return url

		def clean(self):
		@@ -36,7 +42,9 @@ class FlatpageForm(forms.ModelForm):
		for site in sites:
		if same_url.filter(sites=site).exists():
		raise forms.ValidationError(
		_('Flatpage with url %(url)s already exists for site %(site)s') %
		{'url': url, 'site': site})
		_('Flatpage with url %(url)s already exists for site %(site)s'),
		code='duplicate_url',
		params={'url': url, 'site': site},
		)

		return super(FlatpageForm, self).clean()

django/contrib/formtools/wizard/views.py

+4 −1

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ from django.forms import formsets, ValidationError
		from django.views.generic import TemplateView
		from django.utils.datastructures import SortedDict
		from django.utils.decorators import classonlymethod
		from django.utils.translation import ugettext as _
		from django.utils import six

		from django.contrib.formtools.wizard.storage import get_storage
		@@ -271,7 +272,9 @@ class WizardView(TemplateView):
		management_form = ManagementForm(self.request.POST, prefix=self.prefix)
		if not management_form.is_valid():
		raise ValidationError(
		'ManagementForm data is missing or has been tampered.')
		_('ManagementForm data is missing or has been tampered.'),
		code='missing_management_form',
		)

		form_current_step = management_form.cleaned_data['current_step']
		if (form_current_step != self.steps.current and