Changeset 8279

Timestamp:

08/09/08 23:03:01 (1 year ago)

Author:

brosner

Message:

Fixed #4667 -- Added support for inline generic relations in the admin. Thanks to Honza Král and Alex Gaynor for their work on this ticket.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (1 diff)
• django/trunk/django/contrib/contenttypes/generic.py (modified) (2 diffs)
• django/trunk/docs/admin.txt (modified) (1 diff)
• django/trunk/docs/contenttypes.txt (modified) (2 diffs)
• django/trunk/tests/modeltests/generic_relations/models.py (modified) (1 diff)

django/trunk/django/contrib/admin/options.py

@@ -133 +133 @@
-        If kwargs are given, they're passed to the form Field's constructor.
-        """
-
+
-        # If the field specifies choices, we don't need to look for special
-        # admin widgets - we just need to use a select widget of some kind.

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

@@ -7 +7 @@
-from django.db import connection
-from django.db.models import signals
+from django.db import models
-from django.db.models.fields.related import RelatedField, Field, ManyToManyRel
-from django.db.models.loading import get_model
-from django.utils.functional import curry
+
+from django.forms import ModelForm
+from django.forms.models import BaseModelFormSet, modelformset_factory, save_instance
+from django.contrib.admin.options import InlineModelAdmin, flatten_fieldsets
-
-class GenericForeignKey(object):
@@ -274 +279 @@
-    def __init__(self, to, related_name=None, limit_choices_to=None, symmetrical=True):
-        self.to = to
-        self.num_in_admin = 0
-        self.related_name = related_name
-        self.filter_interface = None
-        self.limit_choices_to = limit_choices_to or {}
-        self.edit_inline = False
-        self.raw_id_admin = False
-        self.symmetrical = symmetrical
-        self.multiple = True
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

django/trunk/docs/admin.txt

@@ -786 +786 @@
-either the ``Person`` or the ``Group`` detail pages.
-
+Using generic relations as an inline
+------------------------------------
+
+It is possible to use an inline with generically related objects. Let's say
+you have the following models::
+
+    class Image(models.Model):
+        image = models.ImageField(upload_to="images")
+        content_type = models.ForeignKey(ContentType)
+        object_id = models.PositiveIntegerField()
+        content_object = generic.GenericForeignKey("content_type", "object_id")
+    
+    class Product(models.Model):
+        name = models.CharField(max_length=100)
+
+If you want to allow editing and creating ``Image`` instance on the ``Product``
+add/change views you can simply use ``GenericInlineModelAdmin`` provided by
+``django.contrib.contenttypes.generic``. In your ``admin.py`` for this
+example app::
+
+    from django.contrib import admin
+    from django.contrib.contenttypes import generic
+    
+    from myproject.myapp.models import Image, Product
+    
+    class ImageInline(generic.GenericTabularInline):
+        model = Image
+    
+    class ProductAdmin(admin.ModelAdmin):
+        inlines = [
+            ImageInline,
+        ]
+    
+    admin.site.register(Product, ProductAdmin)
+
+``django.contrib.contenttypes.generic`` provides both a ``GenericTabularInline``
+and ``GenericStackedInline`` and behave just like any other inline. See the
+`contenttypes documentation`_ for more specific information.
+
+.. _contenttypes documentation: ../contenttypes/
+
-``AdminSite`` objects
-=====================

django/trunk/docs/contenttypes.txt

@@ -73 +73 @@
-
-Let's look at an example to see how this works. If you already have
-
-
-
-
-of ``ContentType`` will be created with 
+ application`_
+
+
+
+
-
-    * ``app_label`` will be set to ``'sites'`` (the last part of the Python
@@ -262 +262 @@
-the example above, this means that if a ``Bookmark`` object were deleted, any
-``TaggedItem`` objects pointing at it would be deleted at the same time.
+
+Generic relations in forms and admin
+------------------------------------
+
+``django.contrib.contenttypes.genric`` provides both a ``GenericInlineFormSet``
+and ``GenericInlineModelAdmin``. This enables the use of generic relations in
+forms and the admin. See the `model formset`_ and `admin`_ documentation for
+more information.
+
+``GenericInlineModelAdmin`` options
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``GenericInlineModelAdmin`` class inherits all properties from an
+``InlineModelAdmin`` class. However, it adds a couple of its own for working
+with the generic relation:
+
+    * ``ct_field`` - The name of the ``ContentType`` foreign key field on the
+      model. Defaults to ``content_type``.
+    
+    * ``ct_fk_field`` - The name of the integer field that represents the ID
+      of the related object. Defaults to ``object_id``.
+
+.. _model formset: ../modelforms/
+.. _admin: ../admin/

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

@@ -192 +192 @@
->>> Comparison.objects.all()
-[<Comparison: tiger is stronger than None>]
+
+# GenericInlineFormSet tests ##################################################
+
+>>> from django.contrib.contenttypes.generic import generic_inlineformset_factory
+
+>>> GenericFormSet = generic_inlineformset_factory(TaggedItem, extra=1)
+>>> formset = GenericFormSet(instance=Animal())
+>>> for form in formset.forms:
+...     print form.as_p()
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" maxlength="50" /></p>
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p>
+
+>>> formset = GenericFormSet(instance=platypus)
+>>> for form in formset.forms:
+...     print form.as_p()
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" value="shiny" maxlength="50" /></p>
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" value="5" id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p>
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-1-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-1-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-1-tag" maxlength="50" /></p>
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-1-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-1-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-1-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-1-id" id="id_generic_relations-taggeditem-content_type-object_id-1-id" /></p>
+
-"""}