innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

0.91-bugfixes: Fixed #999 by resolving name clash in the metasystem which could confuse manipulators about which fields they should follow. Refs #1808, #1826, #1839 and #2415, which are variations of this that persist in trunk. 

git-svn-id: http://code.djangoproject.com/svn/django/branches/0.91-bugfixes@4673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2007-03-07 17:03:43 +00:00
parent 02ca9fd1de
commit 8a0fa75839
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/meta/__init__.py
View File

@ -151,7 +151,7 @@ class BadKeywordArguments(Exception):
class BoundRelatedObject(object): class BoundRelatedObject(object):
def __init__(self, related_object, field_mapping, original): def __init__(self, related_object, field_mapping, original):
self.relation = related_object self.relation = related_object
self.field_mappings = field_mapping[related_object.opts.module_name] self.field_mappings = field_mapping[related_object.name]
def template_name(self): def template_name(self):
raise NotImplementedError raise NotImplementedError
@ -165,7 +165,7 @@ class RelatedObject(object):
self.opts = opts self.opts = opts
self.field = field self.field = field
self.edit_inline = field.rel.edit_inline self.edit_inline = field.rel.edit_inline
self.name = opts.module_name self.name = '%s_%s' % (opts.app_label, opts.module_name)
self.var_name = opts.object_name.lower() self.var_name = opts.object_name.lower()
def flatten_data(self, follow, obj=None): def flatten_data(self, follow, obj=None):