test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.2.X] 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. 

Backport of [15124] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2010-12-31 23:06:07 +00:00
parent fa4ac6f80c
commit e501f50237
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/ref/contrib/admin/index.txt
View File

@ -1287,6 +1287,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
------------------------------------
@ -1303,9 +1305,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
@ -1322,10 +1327,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
==========================

11
docs/ref/contrib/contenttypes.txt
View File

@ -359,12 +359,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