diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2010-12-31 23:02:07 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2010-12-31 23:02:07 +0000 |
| commit | 70c8cd41009b5776caf6091e5a0b8a989204d069 (patch) | |
| tree | 92925f7901a55c0418529771b681d846e57370d6 /docs/ref | |
| parent | 5a36b43c2721d6e679ddb952c33c28609ee829e2 (diff) | |
Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/admin/index.txt | 17 | ||||
| -rw-r--r-- | docs/ref/contrib/contenttypes.txt | 11 |
2 files changed, 17 insertions, 11 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index d76d61f0b3..326bca4d18 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -1364,6 +1364,8 @@ Finally, register your ``Person`` and ``Group`` models with the admin site:: Now your admin site is set up to edit ``Membership`` objects inline from either the ``Person`` or the ``Group`` detail pages. +.. _using-generic-relations-as-an-inline: + Using generic relations as an inline ------------------------------------ @@ -1380,9 +1382,12 @@ you have the following models:: 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:: +add/change views you can use ``GenericTabularInline`` or +``GenericStackedInline`` (both subclasses of ``GenericInlineModelAdmin``) +provided by ``django.contrib.contenttypes.generic``, they implement tabular and +stacked visual layouts for the forms representing the inline objects +respectively just like their non-generic counterparts and behave just like any +other inline. In your ``admin.py`` for this example app:: from django.contrib import admin from django.contrib.contenttypes import generic @@ -1399,10 +1404,8 @@ example app:: admin.site.register(Product, ProductAdmin) -``django.contrib.contenttypes.generic`` provides both a ``GenericTabularInline`` -and ``GenericStackedInline`` and behave just like any other inline. See the -:doc:`contenttypes documentation </ref/contrib/contenttypes>` for more specific -information. +See the :doc:`contenttypes documentation </ref/contrib/contenttypes>` for more +specific information. Overriding Admin Templates ========================== diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt index 4a2e213ffb..fb633e91ae 100644 --- a/docs/ref/contrib/contenttypes.txt +++ b/docs/ref/contrib/contenttypes.txt @@ -369,12 +369,15 @@ relations, you'll need to calculate them without using the aggregation API. Generic relations in forms and admin ------------------------------------ -:mod:`django.contrib.contenttypes.generic` provides both a -:class:`~django.contrib.contenttypes.generic.GenericInlineFormSet` -and :class:`~django.contrib.contenttypes.generic.GenericInlineModelAdmin`. +:mod:`django.contrib.contenttypes.generic` provides +:class:`~django.contrib.contenttypes.generic.GenericInlineFormSet`, +:class:`~django.contrib.contenttypes.generic.GenericTabularInline` +and :class:`~django.contrib.contenttypes.generic.GenericStackedInline` +(the last two subclasses of :class:`~django.contrib.contenttypes.generic.GenericInlineModelAdmin`). This enables the use of generic relations in forms and the admin. See the :doc:`model formset </topics/forms/modelforms>` and -:doc:`admin </ref/contrib/admin/index>` documentation for more information. +:ref:`admin <using-generic-relations-as-an-inline>` documentation for more +information. .. class:: generic.GenericInlineModelAdmin |