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

[soc2009/admin-ui] Fix for ticket #11720: "When an OrderField is on an inline and there are empty inlines, saving throws an error"

Browse Source 
If the only things changed in an empty form are OrderField(s), it is treated as untouched.


git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@11462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Zain Memon 2009-08-16 05:55:58 +00:00
parent 687a5af25a
commit 3a99684fe2
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/forms/forms.py
View File

@ -9,7 +9,7 @@ from django.utils.html import conditional_escape
from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from fields import Field, FileField from fields import Field, FileField, OrderField
from widgets import Media, media_property, TextInput, Textarea from widgets import Media, media_property, TextInput, Textarea
from util import flatatt, ErrorDict, ErrorList, ValidationError from util import flatatt, ErrorDict, ErrorList, ValidationError
@ -271,6 +271,7 @@ class BaseForm(StrAndUnicode):
def _get_changed_data(self): def _get_changed_data(self):
if self._changed_data is None: if self._changed_data is None:
self._changed_data = [] self._changed_data = []
order_fields = []
# XXX: For now we're asking the individual widgets whether or not the # XXX: For now we're asking the individual widgets whether or not the
# data has changed. It would probably be more efficient to hash the # data has changed. It would probably be more efficient to hash the
# initial data, store it in a hidden field, and compare a hash of the # initial data, store it in a hidden field, and compare a hash of the
@ -288,7 +289,17 @@ class BaseForm(StrAndUnicode):
initial_value = hidden_widget.value_from_datadict( initial_value = hidden_widget.value_from_datadict(
self.data, self.files, initial_prefixed_name) self.data, self.files, initial_prefixed_name)
if field.widget._has_changed(initial_value, data_value): if field.widget._has_changed(initial_value, data_value):
if isinstance(field, OrderField):
order_fields.append(name)
self._changed_data.append(name) self._changed_data.append(name)
# if this is an empty form and only the OrderField is changed, we want to treat
# it as untouched
if self.empty_permitted and order_fields != []:
difference = filter(lambda x: x not in self._changed_data, order_fields)
if difference == []:
self._changed_data = []
return self._changed_data return self._changed_data
changed_data = property(_get_changed_data) changed_data = property(_get_changed_data)