mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 16 Releases Wiki Activity

Fixed #4297 -- Made form errors available to sub-classes. Thanks, Gary Wilson. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-05-26 08:53:22 +00:00
parent 198127a0f2
commit 1c42c7cade
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/newforms/forms.py
View File

@ -63,7 +63,7 @@ class BaseForm(StrAndUnicode):
self.auto_id = auto_id self.auto_id = auto_id
self.prefix = prefix self.prefix = prefix
self.initial = initial or {} self.initial = initial or {}
self.__errors = None # Stores the errors after clean() has been called. self._errors = None # Stores the errors after clean() has been called.
# The base_fields class attribute is the *class-wide* definition of # The base_fields class attribute is the *class-wide* definition of
# fields. Because a particular *instance* of the class might want to # fields. Because a particular *instance* of the class might want to
@ -87,12 +87,12 @@ class BaseForm(StrAndUnicode):
raise KeyError('Key %r not found in Form' % name) raise KeyError('Key %r not found in Form' % name)
return BoundField(self, field, name) return BoundField(self, field, name)
def _errors(self): def _get_errors(self):
"Returns an ErrorDict for self.data" "Returns an ErrorDict for self.data"
if self.__errors is None: if self._errors is None:
self.full_clean() self.full_clean()
return self.__errors return self._errors
errors = property(_errors) errors = property(_get_errors)
def is_valid(self): def is_valid(self):
""" """
@ -171,11 +171,12 @@ class BaseForm(StrAndUnicode):
def full_clean(self): def full_clean(self):
""" """
Cleans all of self.data and populates self.__errors and self.cleaned_data. Cleans all of self.data and populates self._errors and
self.cleaned_data.
""" """
errors = ErrorDict() errors = ErrorDict()
if not self.is_bound: # Stop further processing. if not self.is_bound: # Stop further processing.
self.__errors = errors self._errors = errors
return return
self.cleaned_data = {} self.cleaned_data = {}
for name, field in self.fields.items(): for name, field in self.fields.items():
@ -199,7 +200,7 @@ class BaseForm(StrAndUnicode):
errors[NON_FIELD_ERRORS] = e.messages errors[NON_FIELD_ERRORS] = e.messages
if errors: if errors:
delattr(self, 'cleaned_data') delattr(self, 'cleaned_data')
self.__errors = errors self._errors = errors
def clean(self): def clean(self):
""" """