mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Changed RelatedObject to take parent_model, not parent_opts, in constructor

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-26 17:12:32 +00:00
parent e865477593
commit 6cfea0d5b9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/fields/related.py
View File

@ -58,7 +58,7 @@ class RelatedField(object):
def do_related_class(self, other, cls): def do_related_class(self, other, cls):
self.set_attributes_from_rel() self.set_attributes_from_rel()
related = RelatedObject(other._meta, cls, self) related = RelatedObject(other, cls, self)
self.contribute_to_related_class(other, related) self.contribute_to_related_class(other, related)
#HACK #HACK

4
django/db/models/options.py
View File

@ -123,7 +123,7 @@ class Options:
for klass in get_models(): for klass in get_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, f)) rel_objs.append(RelatedObject(f.rel.to, klass, f))
self._all_related_objects = rel_objs self._all_related_objects = rel_objs
return rel_objs return rel_objs
@ -157,7 +157,7 @@ class Options:
for klass in get_models(): for klass in get_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, f)) rel_objs.append(RelatedObject(f.rel.to, klass, f))
self._all_related_many_to_many_objects = rel_objs self._all_related_many_to_many_objects = rel_objs
return rel_objs return rel_objs

6
django/db/models/related.py
View File

@ -10,8 +10,8 @@ class BoundRelatedObject(object):
return repr(self.__dict__) return repr(self.__dict__)
class RelatedObject(object): class RelatedObject(object):
def __init__(self, parent_opts, model, field): def __init__(self, parent_model, model, field):
self.parent_opts = parent_opts self.parent_model = parent_model
self.model = model self.model = model
self.opts = model._meta self.opts = model._meta
self.field = field self.field = field
@ -94,6 +94,6 @@ class RelatedObject(object):
# # This method returns "lcom_bestofaward". # # This method returns "lcom_bestofaward".
# Place.lcom_bestofaward_set # "lcom_bestofaward" # Place.lcom_bestofaward_set # "lcom_bestofaward"
rel_obj_name = self.field.rel.related_name or self.opts.object_name.lower() rel_obj_name = self.field.rel.related_name or self.opts.object_name.lower()
if self.parent_opts.app_label != self.opts.app_label: if self.parent_model._meta.app_label != self.opts.app_label:
rel_obj_name = '%s_%s' % (self.opts.app_label, rel_obj_name) rel_obj_name = '%s_%s' % (self.opts.app_label, rel_obj_name)
return rel_obj_name return rel_obj_name