mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
An improved version of the change attempted in [4693]: retain backwards
compatibility with hand-crafted oldforms without breaking edit_inline. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -130,7 +130,9 @@ class FormWrapper(object):
|
||||
if self.edit_inline:
|
||||
self.fill_inline_collections()
|
||||
for inline_collection in self._inline_collections:
|
||||
if inline_collection.name == key:
|
||||
# The 'orig_name' comparison is for backwards compatibility
|
||||
# with hand-crafted forms.
|
||||
if inline_collection.name == key or (':' not in key and inline_collection.orig_name == key):
|
||||
return inline_collection
|
||||
raise KeyError, "Could not find Formfield or InlineObjectCollection named %r" % key
|
||||
|
||||
@@ -226,6 +228,9 @@ class InlineObjectCollection(object):
|
||||
self.errors = errors
|
||||
self._collections = None
|
||||
self.name = rel_obj.name
|
||||
# This is the name used prior to fixing #1839. Needs for backwards
|
||||
# compatibility.
|
||||
self.orig_name = rel_obj.opts.module_name
|
||||
|
||||
def __len__(self):
|
||||
self.fill()
|
||||
|
||||
Reference in New Issue
Block a user