p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: Changed django.core.meta.RelatedObject to take the model class object, not an Options object 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-12-13 19:48:01 +00:00
parent 257f7090ef
commit 76852e5da1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,9 +160,10 @@ class BoundRelatedObject(object):
return repr(self.__dict__) return repr(self.__dict__)
class RelatedObject(object): class RelatedObject(object):
def __init__(self, parent_opts, opts, field): def __init__(self, parent_opts, model, field):
self.parent_opts = parent_opts self.parent_opts = parent_opts
self.opts = opts self.model = model
self.opts = model._meta
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 = opts.module_name
@ -236,7 +237,7 @@ class RelatedObject(object):
return self.opts.get_follow(over) return self.opts.get_follow(over)
def __repr__(self): def __repr__(self):
return "<RelatedObject: %s related to %s>" % ( self.name, self.field.name) return "<RelatedObject: %s related to %s>" % (self.name, self.field.name)
def get_manipulator_fields(self, opts, manipulator, change, follow): def get_manipulator_fields(self, opts, manipulator, change, follow):
# TODO: Remove core fields stuff. # TODO: Remove core fields stuff.
@ -487,7 +488,7 @@ class Options:
for klass in mod._MODELS: for klass in mod._MODELS:
for f in klass._meta.fields: for f in klass._meta.fields:
if f.rel and self == f.rel.to._meta: if f.rel and self == f.rel.to._meta:
rel_objs.append(RelatedObject(self, klass._meta, f)) rel_objs.append(RelatedObject(self, klass, f))
if self.has_related_links: if self.has_related_links:
# Manually add RelatedLink objects, which are a special case. # Manually add RelatedLink objects, which are a special case.
relatedlinks = get_module('relatedlinks', 'relatedlinks') relatedlinks = get_module('relatedlinks', 'relatedlinks')
@ -501,7 +502,7 @@ class Options:
'content_type__package__label__exact': self.app_label, 'content_type__package__label__exact': self.app_label,
'content_type__python_module_name__exact': self.module_name, 'content_type__python_module_name__exact': self.module_name,
}) })
rel_objs.append(RelatedObject(self, relatedlinks.RelatedLink._meta, link_field)) rel_objs.append(RelatedObject(self, relatedlinks.RelatedLink, link_field))
self._all_related_objects = rel_objs self._all_related_objects = rel_objs
return rel_objs return rel_objs
@ -534,7 +535,7 @@ class Options:
for klass in mod._MODELS: for klass in mod._MODELS:
for f in klass._meta.many_to_many: for f in klass._meta.many_to_many:
if f.rel and self == f.rel.to._meta: if f.rel and self == f.rel.to._meta:
rel_objs.append(RelatedObject(self, klass._meta, f)) rel_objs.append(RelatedObject(self, klass, f))
return rel_objs return rel_objs
def get_ordered_objects(self): def get_ordered_objects(self):