Changeset 6900

Timestamp:

12/09/07 01:12:07 (9 months ago)

Author:

mtredinnick

Message:

Fixed #3906 -- Fixed the reverse_m2m_name for a generic relation. Refs #2749.

Files:

• django/trunk/django/contrib/contenttypes/generic.py (modified) (9 diffs)
• django/trunk/tests/modeltests/generic_relations/models.py (modified) (5 diffs)

django/trunk/django/contrib/contenttypes/generic.py

@@ -17 +17 @@
-    fields.
-    """
-
+
-    def __init__(self, ct_field="content_type", fk_field="object_id"):
-        self.ct_field = ct_field
-        self.fk_field = fk_field
-
+
-    def contribute_to_class(self, cls, name):
- 
+
-        # which is a fine error to raise here)
-        self.name = name
-        self.model = cls
-        self.cache_attr = "_%s_cache" % name
-
+
-        # For some reason I don't totally understand, using weakrefs here doesn't work.
-        dispatcher.connect(self.instance_pre_init, signal=signals.pre_init, sender=cls, weak=False)
@@ -36 +36 @@
-
-    def instance_pre_init(self, signal, sender, args, kwargs):
- 
-        
+
+
-        if self.name in kwargs:
-            value = kwargs.pop(self.name)
-            kwargs[self.ct_field] = self.get_content_type(value)
-            kwargs[self.fk_field] = value._get_pk_val()
-
+
-    def get_content_type(self, obj):
-        # Convenience function using get_model avoids a circular import when using this model
-        ContentType = get_model("contenttypes", "contenttype")
-        return ContentType.objects.get_for_model(obj)
-
+
-    def __get__(self, instance, instance_type=None):
-        if instance is None:
@@ -78 +78 @@
-        setattr(instance, self.fk_field, fk)
-        setattr(instance, self.cache_attr, value)
-
+
-class GenericRelation(RelatedField, Field):
-    """Provides an accessor to generic related objects (i.e. comments)"""
@@ -84 +84 @@
-    def __init__(self, to, **kwargs):
-        kwargs['verbose_name'] = kwargs.get('verbose_name', None)
- 
+
-                            related_name=kwargs.pop('related_name', None),
-                            limit_choices_to=kwargs.pop('limit_choices_to', None),
-                            symmetrical=kwargs.pop('symmetrical', True))
-
+
-        # Override content-type/object-id field names on the related class
-        self.object_id_field_name = kwargs.pop("object_id_field", "object_id")
-                
-
+
+
-        kwargs['blank'] = True
-        kwargs['editable'] = False
@@ -117 +117 @@
-    def m2m_column_name(self):
-        return self.object_id_field_name
-
+
-    def m2m_reverse_name(self):
-object_id_field_name
+model._meta.pk.column
-
-    def contribute_to_class(self, cls, name):
@@ -132 +132 @@
-    def contribute_to_related_class(self, cls, related):
-        pass
-
+
-    def set_attributes_from_rel(self):
-        pass
@@ -138 +138 @@
-    def get_internal_type(self):
-        return "ManyToManyField"
-
+
-class ReverseGenericRelatedObjectsDescriptor(object):
-    """
@@ -194 +194 @@
-    Manager) and adds behavior for generic related objects.
-    """
-
+
-    class GenericRelatedObjectManager(superclass):
-        def __init__(self, model=None, core_filters=None, instance=None, symmetrical=None,
-                     join_table=None, source_col_name=None, target_col_name=None, content_type=None,
-                     content_type_field_name=None, object_id_field_name=None):
-
+
-            super(GenericRelatedObjectManager, self).__init__()
-            self.core_filters = core_filters or {}
@@ -213 +213 @@
-            self.object_id_field_name = object_id_field_name
-            self.pk_val = self.instance._get_pk_val()
-
+
-        def get_query_set(self):
-            query = {
- 
+
-                '%s__exact' % self.object_id_field_name : self.pk_val,
-            }

django/trunk/tests/modeltests/generic_relations/models.py

@@ -19 +19 @@
-    content_type = models.ForeignKey(ContentType)
-    object_id = models.PositiveIntegerField()
-
+
-    content_object = generic.GenericForeignKey()
-
+
-    class Meta:
-        ordering = ["tag"]
-
+
-    def __unicode__(self):
-        return self.tag
@@ -31 +31 @@
-    common_name = models.CharField(max_length=150)
-    latin_name = models.CharField(max_length=150)
-
+
-    tags = generic.GenericRelation(TaggedItem)
-
-    def __unicode__(self):
-        return self.common_name
-
+
-class Vegetable(models.Model):
-    name = models.CharField(max_length=150)
-    is_yucky = models.BooleanField(default=True)
-
+
-    tags = generic.GenericRelation(TaggedItem)
-
+
-    def __unicode__(self):
-        return self.name
-
+
-class Mineral(models.Model):
-    name = models.CharField(max_length=150)
-    hardness = models.PositiveSmallIntegerField()
-
+
-    # note the lack of an explicit GenericRelation here...
-
+
-    def __unicode__(self):
-        return self.name
-
+
-__test__ = {'API_TESTS':"""
-# Create the world in 7 lines of code...
@@ -118 +118 @@
-[(u'clearish', <ContentType: mineral>, 1), (u'fatty', <ContentType: vegetable>, 2), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 2)]
-
- 
+
-# remain after deletion of the source object.
->>> quartz.delete()
@@ -124 +124 @@
-[(u'clearish', <ContentType: mineral>, 1), (u'fatty', <ContentType: vegetable>, 2), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 2)]
-
- 
+
-# (other than losing a tag)
->>> tag = TaggedItem.objects.get(id=1)
@@ -133 +133 @@
-[(u'clearish', <ContentType: mineral>, 1), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 2)]
-
+>>> ctype = ContentType.objects.get_for_model(lion)
+>>> Animal.objects.filter(tags__content_type=ctype)
+[<Animal: Platypus>]
+
-"""}