diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-03 19:56:30 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-03 19:56:30 +0000 |
| commit | 9907495b3c412ece76f5e5e4c4e5df12b93caf78 (patch) | |
| tree | 857060089af27bc4af3c3b2cab807fa37a1fc513 /django | |
| parent | 597102199e70d88e9233023f13629194291aed43 (diff) | |
[1.0.X] Fixed #9546: GenericRelations inherited from base models no longer query using the wrong content type. Backport of r10373 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index be67557805..0be1de6e63 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -193,9 +193,9 @@ class ReverseGenericRelatedObjectsDescriptor(object): rel_model = self.field.rel.to superclass = rel_model._default_manager.__class__ RelatedManager = create_generic_related_manager(superclass) - + qn = connection.ops.quote_name - + manager = RelatedManager( model = rel_model, instance = instance, @@ -203,7 +203,7 @@ class ReverseGenericRelatedObjectsDescriptor(object): join_table = qn(self.field.m2m_db_table()), source_col_name = qn(self.field.m2m_column_name()), target_col_name = qn(self.field.m2m_reverse_name()), - content_type = ContentType.objects.get_for_model(self.field.model), + content_type = ContentType.objects.get_for_model(instance), content_type_field_name = self.field.content_type_field_name, object_id_field_name = self.field.object_id_field_name ) |